merge of '13782a894c357c51a3fa0c51cda4e964f6e42721'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 30 Dec 2007 15:35:05 +0000 (15:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 30 Dec 2007 15:35:05 +0000 (15:35 +0000)
     and 'f75a9fcd060f03cadb8d0c99ad2649c5fb05293e'


Trivial merge