Merge branch 'topic/misc-next' into topic/misc
Takashi Iwai [Mon, 27 Oct 2008 07:50:43 +0000 (08:50 +0100)]

Trivial merge