Merge branch 'pknock'

diff --cc configure.ac
Simple merge

diff --cc doc/changelog.txt
index db68ef779397b250979e9bb6742e23fdeba9947d,e5413228b6ddb86588541846d8ce2d6cce2deb6c..cf67d6c71b7407923b999c82e406fb3b8b452be7
--- 1/doc/changelog.txt
--- 2/doc/changelog.txt
+++ b/doc/changelog.txt
@@@ -1,11 -1,19 +1,24 @@@
  
 -
 +HEAD
 +====
  - build: compile fixes for 2.6.31-rt
 +- build: support for Linux 2.6.32
 +- ipp2p: try to address underflows
 +- psd: avoid potential crash when dealing with non-linear skbs
 +- merge xt_ACCOUNT userspace utilities
+ - added reworked xt_pknock module
+   Changes from pknock v0.5:
+   - pknock: "strict" and "checkip" flags were not displayed in `iptables -L`
+   - pknock: the GC expire time's lower bound is now the default gc time
+     (65000 msec) to avoid rendering anti-spoof protection in SPA mode useless
+   - pknock: avoid crash on memory allocation failure and fix memleak
+   - pknock: avoid fillup of peer table during DDoS
+   - pknock: automatic closing of ports
+   - pknock: make non-zero time mandatory for TCP mode
+   - pknock: display only pknock mode and state relevant information in procfs
+   - pknock: check interknock time only for !ST_ALLOWED peers
+   - pknock: preserve time/autoclose values for rules added in
+     reverse/arbitrary order
  
  
  Xtables-addons 1.18 (September 09 2009)