Merge branch 'master' into rpc

James Moger

2011-10-06 cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3

 .project

@@ -10,8 +10,14 @@
         <arguments>

         </arguments>

      </buildCommand>

      <buildCommand>

         <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

         <arguments>

         </arguments>

      </buildCommand>

   </buildSpec>

   <natures>

      <nature>org.eclipse.jdt.core.javanature</nature>

      <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

   </natures>

</projectDescription>