Merge commit 'gcl/merge' into merge
Benjamin Herrenschmidt [Tue, 27 Oct 2009 22:56:18 +0000 (09:56 +1100)]

Trivial merge