Merge with mainline
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 09:11:35 +0000 (02:11 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 09:11:35 +0000 (02:11 -0700)

Trivial merge