Merge branch 'fix/asoc' into topic/asoc
Takashi Iwai [Mon, 4 May 2009 14:05:23 +0000 (16:05 +0200)]

Trivial merge