Merge refs/heads/for-mainline from nokia
authorTony Lindgren <tony@atomide.com>
Mon, 29 Aug 2005 10:29:31 +0000 (13:29 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 29 Aug 2005 10:29:31 +0000 (13:29 +0300)

Trivial merge