merge of '25a24c2d758b820a0edde364e9cc5c7910fa9e70'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 7 Sep 2007 12:52:22 +0000 (12:52 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 7 Sep 2007 12:52:22 +0000 (12:52 +0000)
     and 'f545cd8147e32d6a2cba3afc541559b47a88c272'


Trivial merge