merge of '1eb1e872a6abb77435533ba52aa27b94003eb434'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 10 Jun 2007 22:37:16 +0000 (22:37 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 10 Jun 2007 22:37:16 +0000 (22:37 +0000)
     and 'c8599288dc49a072fdecb653b73e7451328d26de'


Trivial merge