merge of '13230c328dd36efab674e56c004cc0813e282791'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 29 Sep 2007 19:41:47 +0000 (19:41 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 29 Sep 2007 19:41:47 +0000 (19:41 +0000)
     and '2e2e83df3f2d7c5eaea7ab84b89fe681a0267e54'


Trivial merge