Merge branch 'fix/misc' into topic/misc
Takashi Iwai [Wed, 18 Aug 2010 13:17:52 +0000 (15:17 +0200)]

Trivial merge