Merge branch 'fix/ctxfi' into topic/ctxfi
authorTakashi Iwai <tiwai@suse.de>
Wed, 22 Jul 2009 15:06:53 +0000 (17:06 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 22 Jul 2009 15:06:53 +0000 (17:06 +0200)

Trivial merge