From: Tim Abbott <tabbott@mit.edu>
Date: Thu, 21 Feb 2008 00:18:49 +0000 (-0500)
Subject: Merge version 1.5.
X-Git-Tag: debian/1.5-0debathena1~1
X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/1553d96cf51edf4c97726496aecf8f1c6366baf6

Merge version 1.5.

Signed-off-by: Tim Abbott <tabbott@mit.edu>
---

1553d96cf51edf4c97726496aecf8f1c6366baf6