Rebasing merge to junio/next
commitbf4f1068b86dbcf58446f783db4991b5ddde758a
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 12 Apr 2010 12:56:24 +0000 (12 14:56 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 12 Apr 2010 12:56:24 +0000 (12 14:56 +0200)
tree9ae433de3e5e11e52055f052afd729344710fe28
parentb7955ea279cc8cac06de2be84d64a20b7d2a7ea9
parent79e130abc33f8a8a57c78423d670be3656943b58
Rebasing merge to junio/next