merge of '2dba387308c2873b665bd04502559a10e5fe59c0'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 19 Dec 2007 02:03:27 +0000 (02:03 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 19 Dec 2007 02:03:27 +0000 (02:03 +0000)
     and '3a104d2a86c0e7a130667498d91801495e6ee27d'


Trivial merge