_
_
Merge branch 'master' of http://github.com/unbaba/proyAutoMerge

Conflicts:
	trunk/README.txt