Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commitca062aaed0b88060914ffb58442e12fde08db26d
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:56:38 +0000 (7 10:56 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:56:38 +0000 (7 10:56 -0600)
treeac671bac198305db4d62f5c229642abe9aa237ce
parent41bf234d8e35e9273290df278e2aeb88c0c50a4f
parente7b48c97fe7ea0b8149e1e3a20be88a908c2bfcd
Merge remote-tracking branch 'stefanha/trivial-patches' into staging