tree 952d44ca7f7c2f2333fbcc005d8f49f6dbba988f
parent eecaecedec1eb6a47be370a6023bc220a3d30c85
parent 85d59fef9defc78790c8b6cee833d4a77c22a490
author Anthony Liguori <aliguori@us.ibm.com> 1313154362 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1313154362 -0500

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