merge of '52e45ab9ac04b6e0fc8487939269a87d0a38767e'
authorMatthias Hentges <oe@hentges.net>
Sat, 22 Dec 2007 15:00:45 +0000 (15:00 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 22 Dec 2007 15:00:45 +0000 (15:00 +0000)
commit7f3a107ffad1c762c0f9667439f0b28f48b2ffc8
tree4cc8d5f2ab96aa685f306d6aaee88d261f744b60
parent0c869496487a38bbc198075e262960dfce14171d
parenta40dbcd59bb5c6c0788c39971bab989540388cf3
Merge ... '52e45ab9ac04b6e0fc8487939269a87d0a38767e'
     and '953ff27ba96a0d68f716e6a8cd6caff3537e2f41'