Merge branch 'master' of ssh://feistymeow.org/feisty_meow

diff --combined scripts/custom/examples/fred/uva_profile_additions.txt
index 6765749937f998e1e86224e1abb9b8fad523d1ac,98c61d243f79e34112cdc9aede776c8c9001113d..6765749937f998e1e86224e1abb9b8fad523d1ac
mode 100755,100644..100644
--- 1/scripts/custom/examples/fred/uva_profile_additions.txt
--- 2/scripts/custom/examples/fred/uva_profile_additions.txt
+++ b/scripts/custom/examples/fred/uva_profile_additions.txt
@@@ -4,14 -4,8 +4,14 @@@
  
  # extras for uva
  export JAVA_HOME=/usr/lib/jvm/java-6-sun/jre
 -export PATH=$PATH:$JAVA_HOME/bin
  
  # ant options to get the wsdl files to all build properly.
  export ANT_OPTS="-Xms512m -Xmx768m -XX:MaxPermSize=768m"
  
 +# where we have our local eclipse.
 +export ECLIPSE_DIR=/usr/local/eclipse_jee
 +
 +# add in the places we'd like in the path.
 +# java and eclipse go first to override any other installed versions.
 +export PATH=$JAVA_HOME/bin:$ECLIPSE_DIR:$PATH
 +