Merge branch 'devel-misc'
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 02:39:02 +0000 (18:39 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 02:39:02 +0000 (18:39 -0800)

Trivial merge