Merged changes between discount 1,2,1 and 1,2,2
Authored by: artyom-beilis 2008-04-16
Parent: [r210]
Child: [r212]