Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Wed, 18 Aug 2010 13:17:52 +0000 (15:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Aug 2010 13:17:52 +0000 (15:17 +0200)

Trivial merge