Merge commit '3b609e72' into devel
commit02a49bfae0752f88725bb73c4ed51d656d1a2c51
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 21 May 2009 06:58:36 +0000 (21 08:58 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 21 May 2009 06:58:36 +0000 (21 08:58 +0200)
treec3dbde3733283f224ca25088d76f6cc0bd6303ea
parentf9b6fed413c986764ddec526eb8272e06367bb3f
parent3b609e72d60e2e4c6034761b62fc654ddee3e69d
Merge commit '3b609e72' into devel