Merge commit 'jwb/merge' into merge

This commit is contained in:
Benjamin Herrenschmidt 2009-07-08 13:49:38 +10:00
commit 01cc82623a
3 changed files with 166 additions and 56 deletions