[openvswitch/f18: 2/2] Merge branch 'master' into f18

[Thomas Graf]

commit a2e3305f8646f732c1d70a540b10b919d77741ff
Merge: 7fd69d6 312060e
Author: Thomas Graf <tgraf at redhat.com>
Date:   Thu Aug 29 16:14:21 2013 +0200

    Merge branch 'master' into f18

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