Merge changes from master and switch version to 0.9.6.

diff --cc debian/changelog
index c7f7d6660cc9361faa15b8554a1b51e6dc74e36b,cc060524781c2f52a507306b660a957fec5e3413..5b72994ad8dcc4d587514fe416e60c320e3fbcc3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- exfat-utils (0.9.5-1~bpo60+1) squeeze-backports; urgency=low
++exfat-utils (0.9.6-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Backport for Debian/squeeze.
 +  * Change the debian branch in gbp.conf to squeeze-backports.
 +
-  -- Sven Hoexter <hoexter@debian.org>  Sat, 14 Jan 2012 19:17:11 +0100
++ -- Sven Hoexter <hoexter@debian.org>  Wed, 25 Jan 2012 19:14:55 +0100
++
+ exfat-utils (0.9.6-1) unstable; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Sven Hoexter <hoexter@debian.org>  Sat, 14 Jan 2012 18:21:18 +0100
  
  exfat-utils (0.9.5-1) unstable; urgency=low