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)
commit89e1b9511fc7fbfac4139fca5531f5f9d946c537
treeddd770fe678f1885a7a89d7d7e1bba7135c3ae3b
parent9c6c529a21cd3b6efb367256a239eec4153721c0
parent68110661e86868cd107955ec7c077e1f34519f78
Merge branch 'fix/ctxfi' into topic/ctxfi