Merge commit 'kumar/merge' into merge
Benjamin Herrenschmidt [Wed, 11 Nov 2009 04:43:25 +0000 (15:43 +1100)]

Trivial merge