[sems/f12/master: 12/12] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit 9fbc4c4297fcec37248dc12bfe1ba92166b86321
Merge: 0e74699 189d522
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Aug 20 19:23:12 2010 +0400

    Merge branch 'master' into f12/master
    
    Conflicts:
    	sems-0001-Force-to-use-system-wide-GSM-includes.patch
    	sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
    	sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
    	sems-0004-Fix-for-old-python-2.4.patch
    	sems-0005-More-compatibility-with-older-CMake-2.4.patch
    	sems-0006-Typo-paramater-parameter.patch
    	sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch
    	sems-0008-Fix-MOD_NAME-passing-to-gcc.patch
    	sems-0009-More-CMake-templates-for-config-files.patch
    	sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch
    	sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch
    	sems.spec

 ...001-Force-to-use-system-wide-GSM-includes.patch |    4 +-
 ...llow-rewrite-of-custom-makefiles-by-CMake.patch |    4 +-
 ...Set-CFG_PREFIX-to-empty-string-by-default.patch |    4 +-
 sems-0004-Fix-for-old-python-2.4.patch             |    4 +-
 ...5-More-compatibility-with-older-CMake-2.4.patch |    4 +-
 sems-0006-Typo-paramater-parameter.patch           |    4 +-
 ...typo-this-conf-file-actually-is-a-early_a.patch |    4 +-
 sems-0008-Fix-MOD_NAME-passing-to-gcc.patch        |    4 +-
 ...009-More-CMake-templates-for-config-files.patch |    4 +-
 ...-variables-escaping-strategy-on-new-CMake.patch |    4 +-
 ...ql-in-conference-and-early_announce-modul.patch |    4 +-
 ...stream-AmSession-rtp_str-only-if-really-n.patch |  549 ++++++++++++++++++++
 sems.spec                                          |   11 +-
 13 files changed, 581 insertions(+), 23 deletions(-)
---