From: Anders Kaseorg <andersk@mit.edu>
Date: Wed, 30 Mar 2011 08:57:12 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/2.0-0debathena1~7
X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/a4c54cfc424a2f34b8c2628a379301f6da801054

Merge branch 'master' into debian
---

a4c54cfc424a2f34b8c2628a379301f6da801054