merge of '84ca9f2e827e4279aedbe892643f7a992b5c68c0'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 4 Sep 2007 16:23:23 +0000 (16:23 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 4 Sep 2007 16:23:23 +0000 (16:23 +0000)
     and 'a0ad096ef87c2c04fc6f10e82e1a8f91d80c5354'


Trivial merge