merge from bastille
authorPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 15:53:29 +0000 (16:53 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 15:53:29 +0000 (16:53 +0100)
commit4368223876c6727ac7a181f6e7f0ae9adfadf563
tree3df3180a0d9182a381163b1297a72a05566813f2
parente86676b11394080b61d9ab3e753cdbf7067d2c4a
parentd57d1de0928922ffec021faa56361e80a556a96b
merge from bastille