[openstack-neutron/f20: 5/5] Merge branch 'master' into f20

[Terry Wilson]

commit c152e5b6b1cbe88aef5c27f37e5c1eaac017c196
Merge: 647aaee 0eb2cef
Author: Terry Wilson <twilson at redhat.com>
Date:   Thu Dec 12 17:39:09 2013 -0600

    Merge branch 'master' into f20

 0002-Add-fwaas_driver.ini-to-setup.cfg.patch |   24 +++++++
 0003-Sync-rpc-fix-from-oslo-incubator.patch  |   91 ++++++++++++++++++++++++++
 neutron-l3-agent.service                     |    2 +-
 neutron-sudoers                              |    2 +-
 neutron-vpn-agent.service                    |    2 +-
 openstack-neutron.spec                       |   11 +++-
 6 files changed, 128 insertions(+), 4 deletions(-)
---