merge of '046b893ab8fe9a75380cca2843abba168e1dc148'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 10 Feb 2008 18:23:27 +0000 (18:23 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 10 Feb 2008 18:23:27 +0000 (18:23 +0000)
     and '3601dddeaadc9f1eec11df4baadff513d463bbe4'


Trivial merge