merge with head
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 18 Aug 2011 12:33:36 +0000 (14:33 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 18 Aug 2011 12:33:36 +0000 (14:33 +0200)
commit8cd7e2e1ee9c228f332c96e0f8c4d49075c7990d
tree4802f25939a9bd881642ae71fab3f0b6fea57bde
parentce179852d4151a7eb246b2564d5333b260ff9198
parent3ba1f449fc792f93efcb69b534898987e220ddbd
merge with head