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