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