Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Fri, 11 Mar 2011 13:48:09 +0000 (14:48 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 11 Mar 2011 13:48:09 +0000 (14:48 +0100)

Trivial merge