Merge with mainline
authorTony Lindgren <tony@atomide.com>
Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 6 Jun 2005 16:20:17 +0000 (09:20 -0700)

Trivial merge