merge of '759a595e111a9e5fa47000ee0357f261d2bfc364'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 15 Jan 2007 18:16:23 +0000 (18:16 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 15 Jan 2007 18:16:23 +0000 (18:16 +0000)
     and '7605119b22aeec9d1aa8228cee9fb60bc06c51ad'


Trivial merge