tree d622378b5708429037e47b5759adf76525b502c4
parent ec51cf159f2e75d3bdab181877fc28137ce052ba
parent 3bfc65a25ba2e010ef12db0cff006c2cbbeb18f9
author Alexandre Vassalotti <alexandre@peadrop.com> 1323800562 -0500
committer Alexandre Vassalotti <alexandre@peadrop.com> 1323800562 -0500
HG:rename-source hg

Merge 3.2