Merge commit 'gcl/merge' into merge
Benjamin Herrenschmidt [Tue, 10 Mar 2009 23:40:29 +0000 (10:40 +1100)]

Trivial merge