merge of '45ca967807a5074a8c64f0c1a767ad0f29409890'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 25 Aug 2007 20:37:21 +0000 (20:37 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 25 Aug 2007 20:37:21 +0000 (20:37 +0000)
     and '8ae475c0143b6d98f3471fe738ec908cded6e02d'


Trivial merge