Merge remote branch 'kumar/merge' into merge
Benjamin Herrenschmidt [Thu, 26 May 2011 23:58:22 +0000 (09:58 +1000)]

Trivial merge