[mate-power-manager/f17: 9/9] Merge branch 'master' into f17

[Wolfgang Ulbrich]

commit f3eb393968684abe32397ae2a7e630e02ff56061
Merge: b3c07e9 6164cf8
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Jul 24 22:00:01 2013 +0200

    Merge branch 'master' into f17

 .gitignore              |    2 ++
 mate-power-manager.spec |   34 ++++++++++++++++++++++------------
 sources                 |    2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)
---
diff --cc mate-power-manager.spec
index 3d4df9c,348e885..156f511
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@@ -20,9 -23,9 +23,8 @@@ BuildRequires: mate-doc-util
  BuildRequires: mate-keyring-devel
  BuildRequires: mate-panel-devel
  BuildRequires: mesa-libGL-devel
 -BuildRequires: pangox-compat-devel
  BuildRequires: popt-devel
  BuildRequires: rarian-compat
- BuildRequires: systemd-devel
  BuildRequires: unique-devel
  BuildRequires: upower-devel
  BuildRequires: xmlto