[ettercap/f17: 2/2] Merge branch 'f18' into f17

[Jon Ciesla]

commit cc7e549314d6a0c729956838f7217560f716b103
Merge: 55efb7c aed7074
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Sep 10 08:27:39 2012 -0500

    Merge branch 'f18' into f17

 ettercap.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---