merge of '6038f91a4dc42b25653eda3186b1f0679c03374a'
authorMatt Reimer <mattjreimer@gmail.com>
Mon, 19 Feb 2007 18:52:49 +0000 (18:52 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Mon, 19 Feb 2007 18:52:49 +0000 (18:52 +0000)
     and 'eeb5939558020a8cc44cc4a35c2c1cd0356b0880'


Trivial merge