Merged revision 1029-1068,1071-1078,1080-1099,1105-1107,1110 from EFREMOV-BASE2
Authored by: ctapmex 2009-12-17
Parent: [r1162]
Child: [r1164]