merge of 'a534fd1530fba63215db0ae44dbdd6e877c589b4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 17 Feb 2008 03:02:36 +0000 (03:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 17 Feb 2008 03:02:36 +0000 (03:02 +0000)
     and 'f6ab5be390e4400fb993f0e449049b62daece68e'


Trivial merge