Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 11 Oct 2010 11:45:22 +0000 (13:45 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 11 Oct 2010 11:45:22 +0000 (13:45 +0200)

Trivial merge