Support description tags.

Conflicts:
	calypso/xmlutils.py