merge of '440352b74d1975abf361c30e00a2519bd5c8051e'
authorMatt Reimer <mattjreimer@gmail.com>
Mon, 13 Nov 2006 19:19:49 +0000 (19:19 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Mon, 13 Nov 2006 19:19:49 +0000 (19:19 +0000)
     and '493bfe4db4e2664b2f5a442c4973208d987e2752'


Trivial merge