tree 7bcd11dc1669f31c141a4d86cae21c5d636014d7
parent bfd5a32ecdb130b62396120b4841b911667b887e
parent ee4293400cff1d5f9a7a6dd8e9aaa6ba6623e348
author Antoine Pitrou <solipsis@pitrou.net> 1302972916 +0200
committer Antoine Pitrou <solipsis@pitrou.net> 1302972916 +0200
HG:rename-source hg

Merge from 3.2