merge of '5a2399197df237f82ef95027a49f2340a2303958'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 3 Dec 2007 14:35:19 +0000 (14:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 3 Dec 2007 14:35:19 +0000 (14:35 +0000)
     and '87484c4eb87efff598e72698f1723e6aa9cd0111'


Trivial merge