Moved all shared code to a single base
Authored by: artyom-beilis 2010-08-31
Parent: [r1387]
Child: [r1389]