Merge branch 'topic/aoa' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:51 +0000 (00:35 +0100)]

Trivial merge