Merge branch 'fix/misc' into for-linus
Takashi Iwai [Wed, 23 Dec 2009 17:49:55 +0000 (18:49 +0100)]

Trivial merge