merge of '41daabd524e84d8b355abb1ef7c1d06479c25b7d'
authorMatt Reimer <mattjreimer@gmail.com>
Mon, 6 Nov 2006 18:29:44 +0000 (18:29 +0000)
committerMatt Reimer <mattjreimer@gmail.com>
Mon, 6 Nov 2006 18:29:44 +0000 (18:29 +0000)
     and '749aa1340946e929e3de2422cb6c275ee1ae34ba'


Trivial merge