revert last merge
Merge branch 'rscale' of github.com:libical/libical into rscale