backwards compatible with python 2.4
small bug fix (typo) in k/m/g volume tresholds
Merge remote-tracking branch 'origin/2.4-compatible'