Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Wed, 3 Nov 2010 07:17:18 +0000 (08:17 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 Nov 2010 07:17:18 +0000 (08:17 +0100)

Trivial merge