Merge branch 'maint'

diff --cc ChangeLog
index a91561f36c04fde040597f7303042a1a80e35629,6edf59e00480069e053dea0c2d9eb39f5fdea7e7..399a33e60846980098de2a2d69dc99f49e03f97a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,15 +1,19 @@@
+ 2009-12-21  Julien Danjou  <julien@danjou.info>  (tiny change)
+ 
+       Add support for newer python version
+       * m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
+       _AM_PYTHON_INTERPRETER_LIST.
+ 
+ 2009-12-21  Karl Berry  <karl@freefriends.org>
+ 
+       mention ncftpput in gnupload --help
+       * lib/gnupload: Mention ncftpput in `--help' output.
+       Report by Bruce Korb.
+ 
 +2009-12-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      * NEWS: Update.
 +
  2009-12-05  Antonio Diaz Diaz  <ant_diaz@teleline.es>
  
        Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.