merge of '8d612652f6f73c5720cff0a8820757b036cf5d26'
authorMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 16:25:40 +0000 (16:25 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 16:25:40 +0000 (16:25 +0000)
commit75dabaea1044bc9ceebeae6ed2cec16cddb04b84
tree3a23a90e0d912174f354ec52851a57ecdd51d430
parent40d4ae6f75eb1a8f45f5f5d71e96c9c8fa6a2e69
parent08ff1daf1f92bffd5d36e79229c8974efc057802
Merge ... '8d612652f6f73c5720cff0a8820757b036cf5d26'
     and 'aa5081b608a304952b8206352eacb9effc61db7e'