[vdsm/f19: 2/2] Merge branch 'master' into f19

[Federico Simoncelli]

commit 5cd67ebad75b36436196a294c38eceae0d834a79
Merge: dd21d5f 71fb017
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Tue Aug 27 23:38:42 2013 +0200

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

 0001-mom-Require-latest-mom.patch                  |   36 ---
 ...ed-as-conflicting-service-in-the-init-fil.patch |   35 ---
 ...ook-sriov-on-el6-should-not-require-non-e.patch |   40 ---
 ...or-migrations-that-involve-devices-with-n.patch |   49 ---
 ...-retrieve-alias-for-Balloon-and-Console-d.patch |   88 ------
 ...gression-introduced-by-refactoring-libvir.patch |   76 -----
 ...ites-its-version-number-in-VDSM-generated.patch |   53 ----
 ...quires-version-of-selinux-policy-targeted.patch |   41 ---
 ...reg-fix-ovirt_node-without-default-bridge.patch |   47 ---
 ...e-script-now-checks-that-the-DHCP-respons.patch |   46 ---
 ...network-is-now-kept-in-main-routing-table.patch |  324 --------------------
 ...-dhcp-source-routing-if-the-removal-reaso.patch |   38 ---
 ...ge-use-successor-volume-size-when-merging.patch |   47 ---
 ...Z-988299-Fix-GlusterFS-RPM-dep-to-support.patch |   61 ----
 sources                                            |    2 +-
 vdsm.spec                                          |   36 +--
 16 files changed, 6 insertions(+), 1013 deletions(-)
---