Merge fixes fixes-noncritical testing-misc tmp-merge testing-board
authorTony Lindgren <tony@atomide.com>
Fri, 21 Sep 2012 23:33:13 +0000 (16:33 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 21 Sep 2012 23:33:13 +0000 (16:33 -0700)

Trivial merge