Merge HEAD from ../linux-2.6
authorNathan Scott <nathans@bruce>
Wed, 22 Mar 2006 04:31:14 +0000 (15:31 +1100)
committerNathan Scott <nathans@bruce>
Wed, 22 Mar 2006 04:31:14 +0000 (15:31 +1100)

Trivial merge