merge of '9eb0bfbe34d1258e15bdfdccaf57c8a5d5929847'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 19 May 2007 15:47:20 +0000 (15:47 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 19 May 2007 15:47:20 +0000 (15:47 +0000)
     and 'd89e3ee233f10cca12a389232ec2f352a0472f76'


Trivial merge