Merge with mainline
authorTony Lindgren <tony@atomide.com>
Wed, 25 May 2005 19:54:28 +0000 (12:54 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 25 May 2005 19:54:28 +0000 (12:54 -0700)

Trivial merge