merge of '2b98fc6fe63ab6d8f550bd5e53546e27d970f533'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 9 Jul 2008 19:07:51 +0000 (19:07 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 9 Jul 2008 19:07:51 +0000 (19:07 +0000)
     and '6263ba0e14af7bb1eb9f572dc90726e8be06ae51'


Trivial merge