Merge branch 'master' into powerpc

Conflicts:

	makefile
	src/assembler.h
	src/compile.cpp
	src/compiler.cpp
	src/compiler.h
	src/finder.cpp

classpath/java/util/PropertyResourceBundle.java

@@ -23,4 +23,8 @@ public class PropertyResourceBundle extends ResourceBundle {
   public Object handleGetObject(String key) {
     return map.get(key);
   }
+
+  public Enumeration<String> getKeys() {
+    return map.keys();
+  }
 }