merge of '7dfc7a31ac72c55bd7de2ec3f60edae7fcb0bd0d'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 15 Jan 2007 18:11:01 +0000 (18:11 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 15 Jan 2007 18:11:01 +0000 (18:11 +0000)
     and 'b17536d1defa7504daf78e2954412b0f5743cc9b'


Trivial merge