Merge commit '6fca3ad9aa82eb4efa839f4'

Conflicts:
	CMakeLists.txt
	configure.in

diff --cc CMakeLists.txt
index 6b86033790b714d991f430c8c32d95277567ffff,5ff65b46788f99467fc393be23388977a7535896..ca0a0d45272ef2c9a3f899d133f5b0762cf2aab3
--- 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.2-pre1")
 +SET(sarg_REVISION "4-pre1")
  SET(sarg_BUILD "")
- SET(sarg_BUILDDATE "Sep-18-2010")
+ SET(sarg_BUILDDATE "Nov-22-2010")
  
  INCLUDE(AddFileDependencies)
  INCLUDE(CheckIncludeFile)

diff --cc configure.in
Simple merge

diff --cc po/bg.po
Simple merge

diff --cc po/ca.po
Simple merge

diff --cc po/cs.po
Simple merge

diff --cc po/de.po
Simple merge

diff --cc po/el.po
Simple merge

diff --cc po/es.po
Simple merge

diff --cc po/fr.po
Simple merge

diff --cc po/hu.po
Simple merge

diff --cc po/id.po
Simple merge

diff --cc po/it.po
Simple merge

diff --cc po/ja.po
Simple merge

diff --cc po/lv.po
Simple merge

diff --cc po/nl.po
Simple merge

diff --cc po/pl.po
Simple merge

diff --cc po/pt.po
Simple merge

diff --cc po/ro.po
Simple merge

diff --cc po/ru.po
Simple merge

diff --cc po/sk.po
Simple merge

diff --cc po/sr.po
Simple merge

diff --cc po/tr.po
Simple merge

diff --cc po/uk.po
Simple merge

diff --cc po/zh_CN.po
Simple merge