merge of '1b7f7437f810627576f185d5ed5a939c13e74327'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 24 Sep 2006 13:39:58 +0000 (13:39 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 24 Sep 2006 13:39:58 +0000 (13:39 +0000)
     and '5cb090537c921fceef076a93de6fe68e2846d850'


Trivial merge