Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Fri, 16 Sep 2011 06:29:04 +0000 (08:29 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 16 Sep 2011 06:29:04 +0000 (08:29 +0200)

Trivial merge