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

[Jon Ciesla]

commit 55efb7c39bdb1f92fd201ab181aa62c7f727abe5
Merge: b9c27e7 52a7b84
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Sep 6 11:15:17 2012 -0500

    Merge branch 'f18' into f17

 ettercap.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---