Re: [Olena-patches] [Olena] Merging trunk/ to branches/cleanup-2008/