[hylafax+/el6: 4/5] Merge branch 'master' into el6

[Lee Howard]

commit 7c782f65591a97feef030f5911fc3a61cc4a7469
Merge: d915dc3 4ddcf93
Author: Lee Howard <faxguy at howardsilvan.com>
Date:   Mon Feb 25 21:59:55 2013 -0800

    Merge branch 'master' into el6
    
    Conflicts:
    	hylafax+.spec

 hylafax+.spec |  515 ---------------------------------------------------------
 1 files changed, 0 insertions(+), 515 deletions(-)
---