[asterisk/f13/master: 2/2] Merge branch 'f14/master' into f13

[Jeffrey C. Ollie]

commit 62729c7266a257d93aada03bc4efd5d69dcf0948
Merge: 8ded959 080d387
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Wed Aug 11 11:21:04 2010 -0500

    Merge branch 'f14/master' into f13

 .gitignore                                         |    2 +
 ...it-scripts-for-better-Fedora-compatibilty.patch |    4 +-
 ...les.conf-so-that-different-voicemail-modu.patch |    4 +-
 ...king-building-against-an-external-libedit.patch |    4 +-
 ...rary-function-for-loading-command-history.patch |    6 +-
 ...igure.ac-to-look-for-pkg-config-gmime-2.0.patch |    4 +-
 0006-Fix-up-some-paths.patch                       |    4 +-
 ...hema-that-is-compatible-with-Fedora-Direc.patch |    4 +-
 ...2html-to-copy-icons-when-building-documen.patch |    4 +-
 asterisk.spec                                      |   80 +++++++++++++++++++-
 sources                                            |    4 +-
 11 files changed, 98 insertions(+), 22 deletions(-)
---