Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Fri, 2 Dec 2011 09:43:52 +0000 (10:43 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 2 Dec 2011 09:43:52 +0000 (10:43 +0100)

Trivial merge