Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Thu, 22 Sep 2011 14:41:52 +0000 (16:41 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 22 Sep 2011 14:41:52 +0000 (16:41 +0200)

Trivial merge