merge of '8707d2256d87ca3844a2e60a4e054ffec5b09af7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 9 Feb 2008 12:25:00 +0000 (12:25 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 9 Feb 2008 12:25:00 +0000 (12:25 +0000)
     and 'ad92000f8881981e810886f09f574d06c9a5f87a'


Trivial merge