correct version number
use a version number which fits better debian's scheme
Merge branch 'vdr-2.1.x' into debian-2.1.x