Merge remote-tracking branch 'kwolf/for-anthony' into staging
commit9f4bd6baf64b8139cf2d7f8f53a98b27531da13c
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 14:57:06 +0000 (29 09:57 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 14:57:06 +0000 (29 09:57 -0500)
tree9136aeff1fbbd0fd0b0765886cd791c95ccb07c8
parent950c671df1078f4505d1b8461620f48aa91a9fda
parenta22f123ca3d3c09a77af4341ed1fbcc175b54f1d
Merge remote-tracking branch 'kwolf/for-anthony' into staging