[wireshark: 19/19] Merge branch 'f17'

[Jan Šafránek]

commit a5eec8b4c9e507ebb0f5324aa0733810d6c1c4db
Merge: bbf97fb 5c210bc
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Wed Mar 28 09:43:23 2012 +0200

    Merge branch 'f17'
    
    Conflicts:
    	wireshark.spec

 .gitignore     |    1 +
 sources        |    2 +-
 wireshark.spec |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---