[sems/el5/master: 2/2] Merge branch 'master' into el5/master

[Peter Lemenkov]

commit 93af21647a70f6915a73e91e3c8ad1f94ed25ba4
Merge: c9cebbe 1a9e966
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jan 4 23:39:19 2011 +0300

    Merge branch 'master' into el5/master

 ...001-Force-to-use-system-wide-GSM-includes.patch |    2 +-
 ...llow-rewrite-of-custom-makefiles-by-CMake.patch |    2 +-
 ...Set-CFG_PREFIX-to-empty-string-by-default.patch |    2 +-
 ...ql-in-conference-and-early_announce-modul.patch |    2 +-
 ...aid_sip-plugin-to-default-exclude-list-du.patch |    2 +-
 sems-0006-last-minute-fix-proper-version.patch     |    2 +-
 ...gateway-module-s-version-passing-in-CMake.patch |    2 +-
 sems-0008-Install-email-template.patch             |    2 +-
 sems-0009-Don-t-start-py_sems-by-default.patch     |    2 +-
 sems-0010-Move-CMake-defines.patch                 |    2 +-
 ...-0011-Avoid-using-private-Glibc-functions.patch |   67 ++++++++++++++++++++
 sems.spec                                          |    8 ++-
 12 files changed, 84 insertions(+), 11 deletions(-)
---