Releasing vobject 2.1.0
Merge branch '2.1'

Conflicts:
	ChangeLog