Merge branch 'fix/misc' into topic/misc
Takashi Iwai [Sun, 17 Oct 2010 08:38:33 +0000 (10:38 +0200)]

Trivial merge