merge of 'dc99b239ab5958b609e6490dca970a481541c9e3'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 28 May 2007 21:33:17 +0000 (21:33 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 28 May 2007 21:33:17 +0000 (21:33 +0000)
     and 'e26bab2aa774c1eb8d6a6fb3e4a8538081d9466b'


Trivial merge