merge of '629d7abe4cdeb66f4256659308d040ed78152a2a'
authorMatt Reimer <mattjreimer@gmail.com>
Fri, 5 Jan 2007 21:56:31 +0000 (21:56 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Fri, 5 Jan 2007 21:56:31 +0000 (21:56 +0000)
     and 'b754a5f0be53db4b76ca4b5e9313be732e56d8dc'


Trivial merge