merge of '321bc83276f29f5ade630f7aedf3da763002f5a0'
authorMatthias Hentges <oe@hentges.net>
Sat, 17 Mar 2007 17:00:49 +0000 (17:00 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 17 Mar 2007 17:00:49 +0000 (17:00 +0000)
     and '9258a684c6be4358d5956574613b8f216e7c1775'


Trivial merge