[bwm-ng/f19: 4/4] Merge branch 'master' into f19

[Christopher Meng]

commit 483fb8510f4bfbc30a5e7324c5ed091d5edc4216
Merge: 8b9c8eb bbeefea
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Sep 16 16:22:42 2013 +0800

    Merge branch 'master' into f19
    
    Conflicts:
    	bwm-ng.spec

 bwm-ng.spec |   80 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 41 insertions(+), 39 deletions(-)
---
diff --cc bwm-ng.spec
index 541acf5,4e118d2..fad2642
--- a/bwm-ng.spec
+++ b/bwm-ng.spec
@@@ -52,9 -54,15 +54,9 @@@ install -pDm644 bwm-ng.1 %{buildroot}%{
  %{_mandir}/man1/bwm-ng.1*
  
  %changelog
- * Tue Aug 13 2013 Oliver Falk <oliver at linux-kernel.at> - 0.6-10.1
- - Rebuild against new libstatgrab
+ * Mon Sep 16 2013 Christopher Meng <rpm at cicku.me> - 0.6-12
+ - Rebuild for libstatgrab(BZ#1008278).
  
 -* Tue Aug 13 2013 Oliver Falk <oliver at linux-kernel.at> - 0.6-11.1
 -- Rebuild against new libstatgrab
 -
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-11
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-10
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild