merge of '730a1eb946899965bd1703a6dcb9e962751d914a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 25 Jun 2007 14:05:23 +0000 (14:05 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 25 Jun 2007 14:05:23 +0000 (14:05 +0000)
     and 'b02088ae9e5847432d378e1127122006d2d82fa9'


Trivial merge