Sync'ed with CVS repo

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>