Merge branch 'master' into newacpi

Conflicts:
	.gitignore
	cprogs/.gitignore
	debian/.gitignore
	debian/changelog

diff --combined debian/changelog
index 68085018fc5178fedf5aba6692d310a3ccf919db,9af967b52a8b37cb0f52e3a78c0bf3153255a636..4ed6596d88cbf682a253c65fcab00a5524ebf129
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,13 +1,13 @@@
- chiark-utils (4.1.31) unstable; urgency=low
+ chiark-utils (4.1.31~~iwj) unstable; urgency=low
  
 -  * Have .gitignore instead of .cvsignore.
+   * chiark-backup Suggests chiark-utils-bin, not the nonexistent
+     chiark-cprogs (for `summer').
+   * Fix the build-depends to refer to nettle-dev not libnettle-dev.
+   * Add ${misc:Depends} to Depends: lines.  Causes no change to the .debs.
 +  * Switch to git.  Move .cvsignores to .gitignore, etc.
+   * Update my email address.
  
-  --
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 03 Jun 2012 14:56:36 +0100
  
  chiark-utils (4.1.30) unstable; urgency=low