merge of 'a5b587a701c1b83bc8eafda35c7ec55a17c0e5a0'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 11 Jan 2008 11:39:04 +0000 (11:39 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 11 Jan 2008 11:39:04 +0000 (11:39 +0000)
     and 'e4da15abb1304fe4b9181644a6e6e6df3440d6d7'


Trivial merge