merge of '192c54c4e5509fc0ef517826f454b807c6af7658'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 23 Dec 2007 12:22:15 +0000 (12:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 23 Dec 2007 12:22:15 +0000 (12:22 +0000)
     and 'ec60010395d1ec561cf9377a93140bd2f2f31df4'


Trivial merge