merge of '1e52f7b1fc531c1622587e798a3e97e77aa163c8'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 7 Sep 2007 12:16:57 +0000 (12:16 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 7 Sep 2007 12:16:57 +0000 (12:16 +0000)
     and '820b457785f454533cda524e16eb01cf8bc5a680'


Trivial merge