[dsniff/el6: 11/11] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 82f58c1f2a6a3d1dc81a4751fbcea467f4ed52c2
Merge: 334c1b5 e5ec7df
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jul 30 23:25:41 2012 +0200

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	dsniff.spec

 dsniff-2.4-link_layer_offset.patch  |   73 +++++++++++++++++++++++++++++++
 dsniff-2.4-msgsnarf_segfault.patch  |   13 ++++++
 dsniff-2.4-tds_decoder.patch        |   18 ++++++++
 dsniff-2.4-urlsnarf_timestamp.patch |   80 +++++++++++++++++++++++++++++++++++
 dsniff.spec                         |   36 ++++++++++++++-
 5 files changed, 217 insertions(+), 3 deletions(-)
---