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

[Jeffrey C. Ollie]

commit e6eb5f6993331acc0a4bdff363bce1295b45507b
Merge: 8fc2496 3177db1
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Mar 1 08:36:34 2011 -0600

    Merge branch 'f14/master' into f13/master

 .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 |   24 +++---
 ...rary-function-for-loading-command-history.patch |    4 +-
 0005-Fix-up-some-paths.patch                       |   84 ++++++++++----------
 ...hema-that-is-compatible-with-Fedora-Direc.patch |    4 +-
 ...2html-to-copy-icons-when-building-documen.patch |    4 +-
 asterisk.spec                                      |   57 +++++++++++++-
 sources                                            |    4 +-
 10 files changed, 124 insertions(+), 67 deletions(-)
---