merge of '19b2cad8459bddf9473031504b0f30aa3aad97e3'

android/src/net/i2p/router/I2PAndroid.java

apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

.../i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

...2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

...i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

...unnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

...unnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

...tunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

...nel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java

...unnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java

...tunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java

apps/jetty/java/src/org/mortbay/http/HttpContext.java

...ava/src/net/i2p/client/streaming/I2PServerSocketImpl.java

.../routerconsole/java/src/net/i2p/router/web/CSSHelper.java

...sole/java/src/net/i2p/router/web/ConfigClientsHelper.java

...onsole/java/src/net/i2p/router/web/ConfigStatsHelper.java

...sole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java