From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 4 Aug 2007 02:00:25 +0000 (-0400)
Subject: Merge version 1.2.
X-Git-Tag: debian/1.2~1
X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/7e8f1ba3584ce454da41f5397ec1b573da6081e4

Merge version 1.2.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---

7e8f1ba3584ce454da41f5397ec1b573da6081e4