merge of '0138f737ce953e134014ea8fbf6578cc8702b9f5'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 14:22:49 +0000 (14:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 14:22:49 +0000 (14:22 +0000)
     and 'bd33d4ee671cf0bd42fbb0856d7dbb4e29347702'


Trivial merge