Merged changes between discount 1.2.2 up to 1.2.8
Authored by: artyom-beilis 2008-08-19
Parent: [r400]
Child: [r402]