Merge branch 'fix/misc' into for-linus
Takashi Iwai [Mon, 1 Mar 2010 11:38:39 +0000 (12:38 +0100)]

Trivial merge