merge of '4afe7a39abef322799f31bedff527afcc6c16d7f'
authorMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 16:05:31 +0000 (16:05 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 16:05:31 +0000 (16:05 +0000)
commit497afaa96a7b12d0ac0ab21ebc88456c3de1ba33
treedf3b7ad002b91438919a616980202279a13c1dee
parent31e564d9f071df9fb605197e27025eecf15dde72
parent1988774b35c20fb05e2b53dd06992b53b1f00f79
Merge ... '4afe7a39abef322799f31bedff527afcc6c16d7f'
     and 'c9fabe80e49ddb31c5f4120c9b456c5cb1aace8c'