Merge commit 'kumar/merge' into merge
authorBenjamin Herrenschmidt <[email protected]>
Thu, 13 May 2010 01:42:40 +0000 (11:42 +1000)
committerBenjamin Herrenschmidt <[email protected]>
Thu, 13 May 2010 01:42:40 +0000 (11:42 +1000)

Trivial merge