[asterisk/el6/master: 32/33] Merge branch 'f14' into el6

[Jeffrey C. Ollie]

commit 38fc90bfb71557311b908a20c0fe37eaf6c1979e
Merge: 6545788 149b019
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Mon Aug 2 15:15:23 2010 -0500

    Merge branch 'f14' into el6

 .gitignore                                         |    4 +-
 ...it-scripts-for-better-Fedora-compatibilty.patch |   51 +-
 ...les.conf-so-that-different-voicemail-modu.patch |   22 +-
 ...king-building-against-an-external-libedit.patch |   99 ++-
 ...rary-function-for-loading-command-history.patch |   48 ++
 ...igure.ac-to-look-for-pkg-config-gmime-2.0.patch |   35 +
 ...ome-paths.patch => 0006-Fix-up-some-paths.patch |  878 +++++++++-----------
 ...hema-that-is-compatible-with-Fedora-Direc.patch |  146 ++--
 ...2html-to-copy-icons-when-building-documen.patch |   25 +
 asterisk-logrotate                                 |    2 +-
 asterisk.spec                                      |  295 +++++--
 menuselect.makeopts                                |    2 +-
 sources                                            |    4 +-
 13 files changed, 903 insertions(+), 708 deletions(-)
---