Merge branch 'master' into testLoop/MartinBeaudoin
commit971f4a03d27f8da00f49eae42ce4017193ffff01
authorMartin Beaudoin <beaudoin@pollux.local>
Sun, 17 Oct 2010 18:55:15 +0000 (17 14:55 -0400)
committerMartin Beaudoin <beaudoin@pollux.local>
Sun, 17 Oct 2010 18:55:15 +0000 (17 14:55 -0400)
tree377a08adb009c29dc4ee48a2fd873ac8c1b68a6d
parent1518ebfc19fee1aceb78a527ed113bda613cbab7
parent5b3578acb7d28dc6cd74c1fa115bee477be15b9d
Merge branch 'master' into testLoop/MartinBeaudoin