merge of 'adce0d7b339a936c3f4417e986f731cddd2d5ff7'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 27 Dec 2007 23:28:55 +0000 (23:28 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 27 Dec 2007 23:28:55 +0000 (23:28 +0000)
     and 'f3e47f941b50235fe57c645fb3dd590a67411ea0'


Trivial merge