merge of '0cf0e308c229ff2591e8342f494ce06330cfca1b'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 22 May 2007 13:23:00 +0000 (13:23 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 22 May 2007 13:23:00 +0000 (13:23 +0000)
     and 'ce7802218029dce2a1be4e69617eed7935139cda'


Trivial merge