tree d68dceeae57abad08c88f0033ca7228a3cc8ae35
parent 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d
parent e99722f66ae9b25b407c3c5afe4bdd9c9395ebd9
author Anthony Liguori <aliguori@us.ibm.com> 1314276607 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1314276607 -0500

Merge remote-tracking branch 'stefanha/trivial-patches' into staging