merge of 'b90c6e333490c73f6f5aae24f3e0898b87bef4df'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 6 Sep 2007 18:38:51 +0000 (18:38 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 6 Sep 2007 18:38:51 +0000 (18:38 +0000)
     and 'f42f34d21e079ddd26f790b8cfe615ab71d489cd'


Trivial merge