24766235 Change to build PAM_PKCS11 with the pcsclite=yes option for 32 bit
24897765 err_display_time and quiet options are placed incorrectly in pam_pkcs11.conf
24790022 Fix spelling and grammar errors in pam_pkcs11.c messages
This patch originated in-house but is not suitable for upstream.
--- meld-1.4.0/bin/meld Sun Sep 26 15:25:02 2010
+++ meld-1.4.0/bin/new.meld Mon May 2 12:00:56 2011
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/python2.7
### Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>