Rebasing merge to junio/next (38e1251)
commit87c2b031b9ada72cfee07ededdd20845a576725f
authorKarsten Blees <blees@dcon.de>
Thu, 15 Mar 2012 19:38:15 +0000 (15 20:38 +0100)
committerKarsten Blees <blees@dcon.de>
Thu, 15 Mar 2012 19:38:15 +0000 (15 20:38 +0100)
tree4362ec740ff70b404891d07e3ef93a96d2903fb6
parent838c34f81ce31752ad01898e6546f0c3a767dbaa
parent2c05ddb3ce4ef5ba3a797e8207cb878cccea5531
Rebasing merge to junio/next (38e1251)

Previous rebasing merge: 2c05ddb3ce4ef5ba3a797e8207cb878cccea5531