[openvswitch/f19: 3/3] Merge branch 'master' into f19

[Flavio Leitner]

commit d94387062a783d3a31a488fbd5083722dc620e94
Merge: 141f764 2c15225
Author: Flavio Leitner <fbl at redhat.com>
Date:   Sat Mar 8 07:34:22 2014 -0300

    Merge branch 'master' into f19

 .gitignore       |    1 +
 openvswitch.spec |   40 ++++++++++++++++++++++++++++++++++++++--
 sources          |    2 +-
 3 files changed, 40 insertions(+), 3 deletions(-)
---