merge of '18d4581dca99c8e61139671a08cebbf98f7a7f1a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 15:04:35 +0000 (15:04 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 15:04:35 +0000 (15:04 +0000)
     and '2b6814f21f9de4de32873a38a5c277fc38317415'


Trivial merge