merge of '5d1b115fdc0cd4dcc8356e8e2c5aaeca756b6e99'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 13 May 2007 16:43:36 +0000 (16:43 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 13 May 2007 16:43:36 +0000 (16:43 +0000)
     and '8eb20a3d94e5271bda273e384d5e24346ccb0e86'


Trivial merge