Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Fri, 27 Jan 2012 00:48:17 +0000 (16:48 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 27 Jan 2012 00:48:17 +0000 (16:48 -0800)

Trivial merge