merge of '53fc298d41b61bb31958787f71e60f0ada0ea33d'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 28 Mar 2007 15:40:45 +0000 (15:40 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 28 Mar 2007 15:40:45 +0000 (15:40 +0000)
     and '802b2506dd668da5a8ecfb587a125d087042597a'


Trivial merge