merge of '22d90510dcdbad0d05c38bbc2984c79754336a89'
authorMatthias Hentges <oe@hentges.net>
Thu, 1 May 2008 22:03:23 +0000 (22:03 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 1 May 2008 22:03:23 +0000 (22:03 +0000)
commit3ba630d3521c3125a9e58a0479751f3797daf3d5
treeef667d06d23b5927ee2a85b40463ffe763fbfd9d
parentaadc224474b16ce789e357665147666c3f2ca6ee
parent7214bd19dbe1d66905519bd2ca15f2f49e8bd769
Merge ... '22d90510dcdbad0d05c38bbc2984c79754336a89'
     and 'bdf8f6761da7188dd5e88b5096a73feb0816d6b7'