Merge remote branch 'devel' into work/1.7.0.2
commitdd1811f8277a30129cc9ed33ff275ed1e663fabb
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 8 Mar 2010 11:04:54 +0000 (8 12:04 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 8 Mar 2010 11:04:59 +0000 (8 12:04 +0100)
tree4ec2ec43270f3b7d7e8baabab5f8f492cf90c12c
parentb38a696841b1f1a74b35e5cac7074f8077ff7d07
parentef6aded56341fbb09c13c3ca96bd914c7a2509f6
Merge remote branch 'devel' into work/1.7.0.2