Rebasing merge to junio/next
commit890d9f2511f51e6b0d5002bba69aa3155465d69b
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 7 Apr 2010 20:33:20 +0000 (7 22:33 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 7 Apr 2010 20:33:33 +0000 (7 22:33 +0200)
treebf1d5b82f29d4264b74cf19ba8d943bda7ba616d
parent5bbaae2a6f79d828d18b4ddab55ad17ffff6bba8
parent5c1e99faf4cbe2c171fcad72812d4ff8ca48b47f
Rebasing merge to junio/next