merge of '155c9f469df51f8d2bb0f7240c5ce5642ae38c49'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 1 Sep 2007 20:03:41 +0000 (20:03 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 1 Sep 2007 20:03:41 +0000 (20:03 +0000)
     and 'bcabf2efa73e1bd5645cab24e37b6fefb484deb7'


Trivial merge