Merge branch 'master' of lenovo.local:git/hs-java

Does not compile!

Conflicts:
	Java/ClassPath.hs
	Java/ClassPath/Common.hs
	Java/JAR/Archive.hs
	hs-java.cabal

diff --combined hs-java.cabal
index a3b918260201f78afc3f194badf72b9db370a29c,b36222755629cdf5ee961534bc6e001e839b5fda..0641f548700fdb2534083f0ccc319ddd88dd84a9
--- 1/hs-java.cabal
--- 2/hs-java.cabal
+++ b/hs-java.cabal
@@@ -11,6 -11,8 +11,7 @@@ Build-Type:     Simpl
  Description:    This package declares data types for Java .class files format and functions
                  to assemble/disassemble Java bytecode. See dump-class.hs, rebuild-class.hs,
                  TestGen.hs for examples of usage.
 -
+ Bug-reports: http://home.iportnov.ru:3000/projects/hs-java/
  
  Extra-source-files: dump-class.hs
                      rebuild-class.hs
@@@ -49,3 -51,4 +50,3 @@@ librar
  Source-repository head
    type:     git
    location: git@gitorious.org:hs-java/hs-java.git
 -