Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'stefanha/trivial-patches' into staging