merge of '60583f10638bed4ae577443e95e8245aaacfcd6f'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 19 Apr 2007 17:31:28 +0000 (17:31 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 19 Apr 2007 17:31:28 +0000 (17:31 +0000)
     and 'cd73470b889bd3b1b6d2641d31c7a69701abcf46'


Trivial merge