Merge branch 'merge'

This commit is contained in:
Paul Mackerras 2006-04-23 10:55:56 +10:00
commit 916a3d5729