tree a979bc5dcdf7d305e65541f8ffb1982e47c7d3ee
parent cd59dd8734bebe5bd06be8a3fa79a9f4facf6633
parent d2e4d08b3e02deb2d5824b17283c63c1354b7696
author Anthony Liguori <aliguori@us.ibm.com> 1309192035 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1309192035 -0500

Merge remote-tracking branch 'amit/for-anthony' into staging