Merge branch 'maint' into nextmaster
commit0e4f272ad31a7f916956b3d1ef2d2190983c5833
authorFrédéric-Emmanuel PICCA <picca@synchrotron-soleil.fr>
Wed, 2 Jun 2010 13:40:26 +0000 (2 15:40 +0200)
committerFrédéric-Emmanuel PICCA <picca@synchrotron-soleil.fr>
Wed, 2 Jun 2010 13:40:26 +0000 (2 15:40 +0200)
treed381d539450ad24b2eb0586e6d11219c608c1cd4
parent8c4063f49820129c7216e926e84169f89bc2acb0
parent4329a26f92f80f05db415595bd9fe3476fc9512f
Merge branch 'maint' into next