merge of 'a476ffb306a90853f53198c680b4e561337bb4da'
authorMatt Reimer <mattjreimer@gmail.com>
Mon, 30 Oct 2006 19:10:43 +0000 (19:10 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Mon, 30 Oct 2006 19:10:43 +0000 (19:10 +0000)
     and 'f1ff998614be8911a2a9c02be7779e97ebe5c292'


Trivial merge