[asterisk/el6: 2/2] merge

[Jeffrey C. Ollie]

commit c981d068763a18730d8d4131c55794bb9ce695f1
Merge: 327cc15 4479a90
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Fri Jul 1 10:09:37 2011 -0500

    merge

 asterisk.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --cc asterisk.spec
index 8e4c963,eb24600..412ac4a
--- a/asterisk.spec
+++ b/asterisk.spec
@@@ -1249,9 -1223,9 +1251,12 @@@ f
  %{_libdir}/asterisk/modules/app_voicemail_plain.so
  
  %changelog
 +* Fri Jul  1 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.4.4-2
 +- Fix systemd dependencies in EL6 and F15
 +
+ * Thu Jun 30 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.4.4-2
+ - Fedora Directory Server -> 389 Directory Server
+ 
  * Wed Jun 29 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.4.4-1
  - The Asterisk Development Team has announced the release of Asterisk
  - versions 1.4.41.2, 1.6.2.18.2, and 1.8.4.4, which are security