Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 4 Apr 2011 10:21:55 +0000 (12:21 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 4 Apr 2011 10:21:55 +0000 (12:21 +0200)

Trivial merge