tree 0813abba86df9090828f7367e9b03b6d230a459f
parent a952c570c865d5eae6c148716f2cb585a0d3a2ee
parent 2542bfd51c42eead37e0025a9055f74b8c3a1aed
author Anthony Liguori <aliguori@us.ibm.com> 1314903439 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1314903439 -0500

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