Merge branch 'stable-0.7'
commitab51665336c6651457e6a4572ebb630619d2a5a1
authorShawn O. Pearce <spearce@spearce.org>
Fri, 12 Mar 2010 18:29:03 +0000 (12 10:29 -0800)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 12 Mar 2010 18:29:03 +0000 (12 10:29 -0800)
tree7821e046e3a279c3172aed6116dfbd1b876602b0
parent2c14e78a225f4bb7d7d1e82ace2bacee5a6b153e
parent24875de6bd864fa7082e1c96bf8aebe9950c3e54
Merge branch 'stable-0.7'

* stable-0.7:
  Fix NLS to build under Java 5