merge of '68a230b60662c9a02fcec5ffaa9a90510e7b14f4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 21 Jan 2008 02:01:21 +0000 (02:01 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 21 Jan 2008 02:01:21 +0000 (02:01 +0000)
     and '6a123114c50d24ba777fd796259528ed55d645bd'


Trivial merge