merge of 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 9 Mar 2008 21:09:48 +0000 (21:09 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 9 Mar 2008 21:09:48 +0000 (21:09 +0000)
     and 'eeef9d48ea3be5f822125be3f1ce20c53aa97078'


Trivial merge