Merge branch 'fixes' into for-greg
Felipe Balbi [Mon, 15 Aug 2011 16:02:25 +0000 (19:02 +0300)]

Trivial merge