[trafficserver: 7/7] Merge branch 'el6'

[Jan-Frode Myklebust]

commit a85de1ea748769a5375adb1d6756d7255d7b08a8
Merge: f8bcacf 8e7e067
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Thu Mar 22 15:25:41 2012 +0100

    Merge branch 'el6'

 trafficserver.service |    1 -
 trafficserver.spec    |   74 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 5 deletions(-)
---