[asterisk/f13/master: 15/15] Merge remote branch 'origin/f14/master' into f13/master

[Jeffrey C. Ollie]

commit 8ded9592379221e232a1caed7817247462ac220a
Merge: 2621db5 149b019
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Mon Aug 2 16:00:44 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master

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