Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Jun 2010 14:07:34 +0000 (16:07 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Jun 2010 14:07:34 +0000 (16:07 +0200)

Trivial merge