[cig-commits] commit: merge all versions.

[Mercurial]

changeset:   105:01d9ce0daa87
tag:         tip
parent:      104:a050fd498e49
parent:      102:e30b673c15e2
user:        Sylvain Barbot <sbarbot at caltech.edu>
date:        Fri May 11 15:50:06 2012 -0700
description:
merge all versions.