merge of '0522ce6e18539b2787b0461c02f133fb7067acc9'
authorMatt Reimer <mattjreimer@gmail.com>
Tue, 14 Nov 2006 19:53:02 +0000 (19:53 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Tue, 14 Nov 2006 19:53:02 +0000 (19:53 +0000)
     and 'ed6e67aa7fd65b6d6d815724100fcd050742b0f6'


Trivial merge