From: Anders Kaseorg <andersk@mit.edu>
Date: Wed, 28 May 2008 00:16:14 +0000 (-0400)
Subject: Merge version 1.6.
X-Git-Tag: debian/1.6-0debathena1~3
X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/3a9fd60db32dfae88c7124832608ddfd5dc5fb2a

Merge version 1.6.

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

3a9fd60db32dfae88c7124832608ddfd5dc5fb2a