Merge branch 'topic/oss-fix' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:16 +0000 (00:36 +0100)]

Trivial merge