tree 4ef1809f16a7f30f237840cdbfc5521afd4e8316
parent fb787f81e749fde8c74548f9db1472eb321b9a0c
parent 33b1db1c8888b77e06c720ebef0482ed598eb384
author Anthony Liguori <aliguori@us.ibm.com> 1278431281 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1278431281 -0500

Merge remote branch 'kwolf/for-anthony' into staging