Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/jpf-core

diff --cc main.jpf
index e8e84743bbefaffab36aa18276659f5ed5a92452,2034df42d7db3a108b04f15add3747f737d79e40..5b61c44e740ca7727c0f1262fbcfe6b7dd1f345d
--- 1/main.jpf
--- 2/main.jpf
+++ b/main.jpf
@@@ -26,9 -26,6 +26,9 @@@ apps=App1,App
  #track_location_var_conflict=true
  
  # Timeout in minutes (default is 0 which means no timeout)
- timeout=3
+ timeout=0
  
 +#search.class = gov.nasa.jpf.search.heuristic.RandomHeuristic
  #search.class = gov.nasa.jpf.search.heuristic.UserHeuristic
 +#search.class = gov.nasa.jpf.search.heuristic.BFSHeuristic
 +#search.class = gov.nasa.jpf.search.heuristic.DFSHeuristic