merge of '69b24f05990089d31c143d00fc28da86b70d99bb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Jul 2007 01:15:28 +0000 (01:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Jul 2007 01:15:28 +0000 (01:15 +0000)
     and 'd7b91fec09e1a9f4dcf72719c9b671b8e846f0a3'


Trivial merge