merge of '304f7e476fe8624db6410c0656b7dd8f78ad60f2'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 5 Jan 2008 10:32:06 +0000 (10:32 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 5 Jan 2008 10:32:06 +0000 (10:32 +0000)
     and 'fcfb658bc0012d559f131ce8495a388677380d94'


Trivial merge