Some refactoring.
Merge branch 'itip' of github.com:fruux/sabre-vobject into itip
Some refactoring.