Merge branch 'fix/ctxfi' into topic/ctxfi

This commit is contained in:
Takashi Iwai 2009-07-20 17:08:01 +02:00
commit 9c6c529a21