Merge remote branch 'contrib/devel2' into devel
commit074b36b28cddb410f0a9cf659c5d7195d508f738
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 6 Jun 2010 15:12:50 +0000 (6 17:12 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 6 Jun 2010 15:12:50 +0000 (6 17:12 +0200)
treeea04b1b45ed66c497d4a29472e842f988acd5e3d
parent97da4ea32e0858c7ce442fc1a3b61c566ca2842e
parent1c3eebdec2647d0ea185dc4706a8128fb7086003
Merge remote branch 'contrib/devel2' into devel