Rebasing merge to junio/next (56e7932)
commit5b530bf2cfd7284507d63dde76fc6c308bad5916
authorPat Thoyts <patthoyts@users.sourceforge.net>
Tue, 6 Dec 2011 00:20:40 +0000 (6 00:20 +0000)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Tue, 6 Dec 2011 00:20:40 +0000 (6 00:20 +0000)
treed90ded67aca8ddcc208384eb00aa347309c51e57
parentc13a9caa4407416578072b5f5dea100051f3d6c3
parent99df39b20a4c18ef89f4bbdb74f75417ac704c5c
Rebasing merge to junio/next (56e7932)

Previous rebasing merge: f0a20fa5e44146ddc65ad6c2fdab7831bc423d99