Merge branch 'fixes'
authorRussell King <[email protected]>
Mon, 7 Feb 2011 19:07:10 +0000 (19:07 +0000)
committerRussell King <[email protected]>
Mon, 7 Feb 2011 19:07:10 +0000 (19:07 +0000)

Trivial merge