Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Fri, 19 Aug 2011 06:30:38 +0000 (08:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 19 Aug 2011 06:30:38 +0000 (08:30 +0200)

Trivial merge