merge of '7a9c6dcd00355e7f104559fd3a74974aad0d5967'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 25 Dec 2006 22:05:50 +0000 (22:05 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 25 Dec 2006 22:05:50 +0000 (22:05 +0000)
     and 'd8f40f8cb3de1c538fda459dafaa6d8595095b6e'


Trivial merge