Merge branch 'fix/misc' into for-linus
Takashi Iwai [Wed, 17 Mar 2010 08:01:33 +0000 (09:01 +0100)]

Trivial merge