Merging in code from original

merging in git://git.fedorahosted.org/git/dogtail.git