merge of '4688c77d9f496fd36f6b1845f37bc3c42af85968'
authorMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 17:58:08 +0000 (17:58 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 17:58:08 +0000 (17:58 +0000)
commit74947ce74fbbfd607822b5517a02e1f24c22043a
tree64d22a9e645571a8ca1ea9f767dc51e5952ae8fc
parent317dff501985194a0e45ea620a9dce178784ec2b
parent86ac2421b3bb0fc7d8b38c7fa43477db1f389b14
Merge ... '4688c77d9f496fd36f6b1845f37bc3c42af85968'
     and 'dd83c0ba4e83a6207462418b614431ce061d9481'