merge of '01798a2a11c1f1c74e406486dc3e8b456e3a7e3c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Feb 2008 14:26:02 +0000 (14:26 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Feb 2008 14:26:02 +0000 (14:26 +0000)
     and '5e355cb98cf1742f5a79dfe4777b01a20d63e782'


Trivial merge