Merge commit '24eb624ea44bf4c82c602ce'

Conflicts:
	configure.in

diff --cc CMakeLists.txt
index 635d8c739d15c0cc7688a6962108043a4fe5cba4,a541a3cfb78e65bf372bfa8cb8f05e97e6bf5093..9a604d4db4415d9eec7014c6c33560569e34fe5d
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,9 -1,9 +1,9 @@@
  CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
  PROJECT(sarg C)
  SET(sarg_VERSION 2)
 -SET(sarg_REVISION "3.3-pre1")
 +SET(sarg_REVISION "4-pre1")
  SET(sarg_BUILD "")
- SET(sarg_BUILDDATE "Dec-07-2011")
+ SET(sarg_BUILDDATE "Jan-06-2012")
  
  INCLUDE(AddFileDependencies)
  INCLUDE(CheckIncludeFile)

diff --cc configure.in
index 6c9187c7d7acbea35ed922dfd81ae146b0ac8565,5e938d456d5aea15852ed611439632e7f4e26150..5f4e6e7ac9a4d27478d4ce399d8b7e4b0a3017ba
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
- dnl Process this file with autoconf to produce a configure script.
+ dnl Process this file with autoconf or autoreconf to produce a configure script.
 -AC_INIT([sarg],[2.3.3-pre1])
 +AC_INIT([sarg],[2.4-pre1])
  AC_CONFIG_SRCDIR([log.c])
  AC_CONFIG_AUX_DIR(cfgaux)