merge of '363edf7af76f2d2fcd09d314641bad256b866264'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 26 Dec 2007 15:24:42 +0000 (15:24 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 26 Dec 2007 15:24:42 +0000 (15:24 +0000)
     and 'e0812b867aee310381150ec8e2be57aab30190a6'


Trivial merge