merge of '380d0bd7c4a4d64fd250a72fc04232264b91f091'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Sun, 21 Oct 2007 13:52:18 +0000 (13:52 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Sun, 21 Oct 2007 13:52:18 +0000 (13:52 +0000)
     and 'cd2dae68b2957306378aca79319d9d009a776ed2'


Trivial merge