resolved conflicts for merge of ce307f88 to eclair-mr2

diff --cc Bundle.h
Simple merge

diff --cc Command.cpp
Simple merge

diff --cc Main.cpp
index bd03b742b4a2dd0c0ec6a49e773473def2e3d1ec,0b51ad8eb9c8274f3d0c7c94d8fe37ea7efafaf3..efbb2f7511c2ab30d3e0e3e0a2c25e688dbba28c
--- 1/Main.cpp
--- 2/Main.cpp
+++ b/Main.cpp
@@@ -116,9 -116,8 +116,9 @@@ void usage(void
          "   -J  specify where to output R.java resource constant definitions\n"
          "   -M  specify full path to AndroidManifest.xml to include in zip\n"
          "   -P  specify where to output public resource definitions\n"
-         "   -S  directory in which to find resources.  Multiple directories will be scanned"
-         "       and the first match found (left to right) will take precedence."
+         "   -S  directory in which to find resources.  Multiple directories will be scanned\n"
+         "       and the first match found (left to right) will take precedence.\n"
 +        "   -8  Encode string resources in UTF-8.\n"
          "   -0  specifies an additional extension for which such files will not\n"
          "       be stored compressed in the .apk.  An empty string means to not\n"
          "       compress any files at all.\n"