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

[Federico Simoncelli]

commit 0ab99e0f9c8d9cf302cf505ce27b3a1f16af0ceb
Merge: 5cd67eb f49b65b
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Tue Sep 10 14:59:23 2013 +0200

    Merge branch 'master' into f19

 ...init-no-need-to-stop-conflicting-services.patch |   38 ++++++++++++++++++++
 vdsm.spec                                          |    8 ++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---