merge of '66dfc103d9012180e06c8ddc348f24c9120e141a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Apr 2007 10:17:19 +0000 (10:17 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Apr 2007 10:17:19 +0000 (10:17 +0000)
     and '85f4d68da1f7568b055435a5abec3a484fec19bd'


Trivial merge