Merge branch 'fix/misc' into topic/misc
Takashi Iwai [Fri, 25 Dec 2009 13:15:31 +0000 (14:15 +0100)]

Trivial merge