merge of '785f4833ac707489462f9c6ad05b4bb9b70be453'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Sun, 21 Oct 2007 19:21:40 +0000 (19:21 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Sun, 21 Oct 2007 19:21:40 +0000 (19:21 +0000)
     and '7bfeaee7fd729a8cf67751baf0aa3a8037da1e66'


Trivial merge