Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe

* 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe:
  debian/changelog: Another version.
  Disassociate public key tags from peer names.
  svc/conntrack: Make the kickpeers coroutine more robust.
  svc/conntrack.8.in: Document the D-Bus connection state notifications.
  peerdb/peers.in.5.in: Fix formatting.

Conflicts:
	debian/changelog

diff --cc debian/changelog
index e2cc8d21e728ee86cb59d165226bed4cd65164d1,2a7576fc2ddc3d0d6f9dd2ac18dcd3e701ffe000..03aa001467f812ab039170636c4991644b0a8fc3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
 -tripe (1.0.0pre9) experimental; urgency=low
++tripe (1.0.0pre9maemo1) experimental; urgency=low
+ 
+   * Make conntrack rather more robust against errors.
+   * Logically separate key tags from peer names.
+ 
+  -- Mark Wooding <mdw@distorted.org.uk>  Mon, 17 May 2010 20:27:33 +0100
+ 
 +tripe (1.0.0pre8.1maemo1) experimental; urgency=low
 +
 +  * Maemo-specific hacking: remove GUI stuff and Wireshark integration;
 +    force Python version (to avoid bogus ancient Scratchbox version).
 +
 + -- Mark Wooding <mdw@distorted.org.uk>  Sat, 15 May 2010 21:07:19 +0100
 +
  tripe (1.0.0pre8.1) experimental; urgency=low
  
    * Whoops.  conntrack was almost completely broken.  Fix it a lot.