* merged branches

     and 'ef760639d59a6ab522ec50a95cc848e09bf11bd8'

    * fixed OOM on lock (woops! my bad!)

            to branch 'i2p.i2p' (head 9cdab8e186f77c375fd81913d3b3c20e5ca69ca2)

     and 'a0a87038370fb791c619419d56a3133ee7ccec5f'

SAMv3: bug corrected: sending datagrams through the datagram session socket works (like in v1 and v2)

          (everything now in net.i2p.desktopgui)
    * desktopgui: some variable renaming in general configuration 

    * SAM: blocking case corrected on simultaneous client connection (v.1-3)

     and '44b9f7b1bcd59acc89551681bfab2709ab5e9972'

            to branch 'i2p.i2p' (head 622324a8f0f863b7b4eaaa26385228a65c71edf0)

    * Added general configuration options (still not available by default)
    * General fixes
    * Added ant build options (irc says eche|on would like that ;))

    * Hopefully the last fixes for BOB.
    * Fixes to prevent race in client-side I2CP and Notifier.

      idle because it pings the server

     and '44a775450f24ec5d2e921ab01b94546968f81851'

    * More hopeful fixes for BOB.
    * Added new Robert ID to snark

            to branch 'i2p.i2p' (head 25097fabfedcbe372d42dcddaf89b5279e9285e4)

  - Try to fix locking to prevent duplicate destinations when using
    the new option new-dest-on-resume. Still not right for shared clients
    but should be better for non-shared.

  - Launcher on linux was stopping after trying opera, whether it succeeded or failed.
    Now it keeps going to try firefox, etc. as designed.

     and 'f59c86f21a1941949b9797e766708900eed053a6'