Eric Davis bdc7325a82 Merge branch 'master' into unstable
Conflicts:
	doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07:00
..
2011-04-16 16:11:49 -07:00
2011-05-01 13:09:15 -07:00