merge of '904a73c537db997791db05bbbdc95a7aa894e621'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 18 Oct 2007 18:01:14 +0000 (18:01 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 18 Oct 2007 18:01:14 +0000 (18:01 +0000)
     and 'e2424a77b8ed2f3814a65d2a183c9ea96f9a4bfe'


Trivial merge