Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Tue, 14 Sep 2010 14:15:29 +0000 (16:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 14 Sep 2010 14:15:29 +0000 (16:15 +0200)

Trivial merge