Rebasing merge to junio/next
commitc1c7c77ab9e5ccb177dde25f2a3cfd4ab656d9a7
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 28 Apr 2010 14:25:19 +0000 (28 16:25 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 28 Apr 2010 14:25:19 +0000 (28 16:25 +0200)
tree2c92e0dfa711e5cd113a13180b78946198a58e55
parentc5ba0d9fa2197f8bfb6899515bae0228e8424d61
parent95858c276b42719b19f17f68834092e615f58e3e
Rebasing merge to junio/next