From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 29 Jul 2008 10:57:34 +0000 (-0400)
Subject: Merge version 1.7.
X-Git-Tag: debian/1.7-0debathena1~2
X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/64317660c0f8100e3abc61eb3c63b3d9d2e6101b

Merge version 1.7.

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

64317660c0f8100e3abc61eb3c63b3d9d2e6101b