Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Sat, 11 Aug 2012 06:28:44 +0000 (23:28 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 11 Aug 2012 06:28:44 +0000 (23:28 -0700)

Trivial merge