merge of '9f877480867cc9cabebff8145a336b76f7a0f58d'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 20 Aug 2007 18:01:18 +0000 (18:01 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 20 Aug 2007 18:01:18 +0000 (18:01 +0000)
     and 'b396aa55286b5d00bbc2fba14ef9dd30b82a3af9'


Trivial merge