Merge branch 'topic/misc' into for-linus
Takashi Iwai [Mon, 5 Jan 2009 17:34:25 +0000 (18:34 +0100)]

Trivial merge