Merged with mainline
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 10:14:26 +0000 (03:14 -0700)

Trivial merge