let getRID return a real integer
Merge branch 'master' of github.com:collective/collective.solr

Conflicts:
	CHANGES.txt