[open-vm-tools/el6: 2/2] Merge branch 'master' into el6

[Simone Caronni]

commit 183d9cb9b817f428f5a39dc4ca2bf70d5563f48e
Merge: 8598ed6 f6ef9c2
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Mar 27 10:51:35 2014 +0100

    Merge branch 'master' into el6

 open-vm-tools.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --cc open-vm-tools.spec
index 4b2b34b,40ea7c1..929bf32
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@@ -73,12 -67,10 +73,13 @@@ Requires:               net-tool
  Requires:               dbus
  Requires:               grep
  Requires:               sed
 -Requires:               systemd
  Requires:               tar
+ Requires:               which
  
 +%if 0%{?fedora} || 0%{?rhel} >= 7
 +Requires:               systemd
 +%endif
 +
  %description
  The %{name} project is an open source implementation of VMware Tools. It
  is a suite of open source virtualization utilities and drivers to improve the