merge with jk master
authorAymeric Mansoux <aymeric@goto10.org>
Wed, 2 Mar 2011 20:47:33 +0000 (21:47 +0100)
committerAymeric Mansoux <aymeric@goto10.org>
Wed, 2 Mar 2011 20:47:33 +0000 (21:47 +0100)
commit00246415c983bcf94a372b9ea976307c29f8eb28
tree11fad3315bfd0389bb733b0c4f8ddfbc279261d6
parentd878e3985b756e3dbc1b0374d7fc74d91af00bda
parent51b0b2d47adea538aef443a752b19a812847ad16
merge with jk