merge of '4d7d106ba858e881e70ced98ec75da0a78a4b634'
authorMatthias Hentges <oe@hentges.net>
Mon, 7 Jan 2008 10:57:34 +0000 (10:57 +0000)
committerMatthias Hentges <oe@hentges.net>
Mon, 7 Jan 2008 10:57:34 +0000 (10:57 +0000)
commit22fa6b810504540259d94cb810cc55313426597b
treecea825cdb45794689b7491e2d3d41a78eec617e6
parent66d0ba1fb82e491c0b1d408abcbe4ad630a08e67
parentb9563cc443ff9eb0af87cbc48da5c2f37e45305a
Merge ... '4d7d106ba858e881e70ced98ec75da0a78a4b634'
     and 'a9234837102809b3f5f82abc11e373c14c1c638b'