2 commits

Author	SHA1	Message	Date
mb863	0f7d3cbaca	Merged manually some changes	2010-07-23 15:52:13 +00:00
rjy7	a82411b2f0	merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint	2010-07-22 18:47:44 +00:00