Merge remote branch 'kumar/merge' into merge
Benjamin Herrenschmidt [Thu, 9 Jun 2011 04:46:32 +0000 (14:46 +1000)]

Trivial merge