Author: akarasulu
Date: Sat Feb  5 19:46:42 2011
New Revision: 1067493

URL: http://svn.apache.org/viewvc?rev=1067493&view=rev
Log:
merging in changes from trunk

Modified:
    directory/studio/branches/m1/   (props changed)

Propchange: directory/studio/branches/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb  5 19:46:42 2011
@@ -1,3 +1,3 @@
 /directory/studio/branches/shared-trunk-merge:1004968-1005876
 /directory/studio/branches/studio-connection-refactoring:1022102-1030058
-/directory/studio/trunk:1066125-1066912
+/directory/studio/trunk:1066125-1067492