Adopt latest google collections snapshot (partially); some style cleanup

git-svn-id: https://google-guice.googlecode.com/svn/trunk@504 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/guice.iml b/guice.iml
index 3fc4d87..f4d0954 100644
--- a/guice.iml
+++ b/guice.iml
@@ -69,21 +69,14 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/build/asm-3.1.jar!/" />
+          <root url="file://$MODULE_DIR$/lib/build" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib/build" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/build/cglib-2.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" exported="" name="collect" level="project" />
     <orderEntryProperties />
   </component>
 </module>