merged from trunk v0.6.2.9
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 26 Jun 2011 15:41:35 +0000 (15:41 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 26 Jun 2011 15:41:35 +0000 (15:41 +0000)
commit9cadb3e32f31b8a40fee76928bad7b06348803c4
tree38fc0dc14b0220827520ef43873667818b2c808a
parent19e9c98272b590a067e69bc230228697822db49d
parentedda29b48b7e38f5c3a46c78b2da0242a8d054ea
merged from trunk