[wireshark/f19: 4/4] Merge branch 'master' into f19

[Peter Lemenkov]

commit 6d449ca3a68cf24cd5b57d9028b608d5cc9978d2
Merge: a09a678 b6d90cd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Oct 3 12:43:34 2013 +0400

    Merge branch 'master' into f19
    
    Conflicts:
    	wireshark.spec

 wireshark-0001-enable-Lua-support.patch            |    2 +-
 ...rk-0002-Customize-permission-denied-error.patch |    2 +-
 ...Load-correct-shared-object-name-in-python.patch |    2 +-
 wireshark-0004-fix-documentation-build-error.patch |    2 +-
 ...05-fix-string-overrun-in-plugins-profinet.patch |    2 +-
 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |    2 +-
 ...07-The-beginning-of-an-openflow-dissector.patch |    2 +-
 wireshark-0008-adds-autoconf-macro-file.patch      |    2 +-
 ...shark-0009-Restore-Fedora-specific-groups.patch |    2 +-
 wireshark-0010-Add-pkgconfig-entry.patch           |    2 +-
 wireshark-0011-Install-autoconf-related-file.patch |    2 +-
 ...port-of-r52142-and-r52144-to-fix-collisio.patch |   73 ++++++++
 ...ark-0014-Added-basic-conversation-support.patch |  178 ++++++++++++++++++++
 wireshark.spec                                     |   15 ++-
 14 files changed, 276 insertions(+), 12 deletions(-)
---