merge of '13126e3c4c86326c68fc0b5dc3b7bcadd544ea20'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 9 Mar 2008 21:09:56 +0000 (21:09 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 9 Mar 2008 21:09:56 +0000 (21:09 +0000)
     and 'e3bce18db3557d05994587f4a53578acbc1f3792'


Trivial merge