Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)

Trivial merge