merge of '635b19191517f99ee151ae6157a22f5d56406238'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 20 May 2008 20:23:12 +0000 (20:23 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 20 May 2008 20:23:12 +0000 (20:23 +0000)
     and 'c179e5e451e08eb1f3266b4da027de66abad7a9b'


Trivial merge