2 Commits (3bd6c1919cc3a142a112278a6dc83bd8292bcb5a)

Author	SHA1	Message	Date
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
Dave Hiller	9a7d68cfce	svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated	2008-07-31 12:15:15 +00:00