merge of '744cf977fa353b9dedb30f35cd9ba988ade94e8d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 Jan 2008 08:44:15 +0000 (08:44 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 Jan 2008 08:44:15 +0000 (08:44 +0000)
     and 'cbd73e4685a6b456be3670606d5020189741092e'


Trivial merge