Merge branch 'topic/ctxfi-fix' into topic/ctxfi
authorTakashi Iwai <tiwai@suse.de>
Tue, 2 Jun 2009 13:55:22 +0000 (15:55 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 2 Jun 2009 13:55:22 +0000 (15:55 +0200)

Trivial merge