Merge branches/froyo_12.03 to head.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@899 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --cc android/AndroidManifest.xml
Simple merge

diff --cc core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index b27fbbb0d6ebecde548713bb6111ba40dc18ea4e,9ea7374caf9afe7ddb84b69492c54c5aecded7a8..9000a5400fa2ef77672604f95c4409b2b9f6749b
--- 1/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
--- 2/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@@ -1853,17 -1814,17 +1852,17 @@@ public abstract class RocketComponent i
         */
        private static class RocketComponentIterator implements Iterator<RocketComponent> {
                // Stack holds iterators which still have some components left.
-               private final Deque<Iterator<RocketComponent>> iteratorStack = new ArrayDeque<Iterator<RocketComponent>>();
+               private final SimpleStack<Iterator<RocketComponent>> iteratorStack = new SimpleStack<Iterator<RocketComponent>>();
 -              
 +
                private final Rocket root;
                private final int treeModID;
 -              
 +
                private final RocketComponent original;
                private boolean returnSelf = false;
 -              
 +
                // Construct iterator with component's child's iterator, if it has elements
                public RocketComponentIterator(RocketComponent c, boolean returnSelf) {
 -                      
 +
                        RocketComponent gp = c.getRoot();
                        if (gp instanceof Rocket) {
                                root = (Rocket) gp;