[upower/f21: 6/6] Merge branch 'master' into f21

[Rex Dieter]

commit 60f9a16af9e9363ac1cbcc2aa9cd9820b6ae8e41
Merge: 45ab415 56f1ad5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 18 08:13:21 2015 -0500

    Merge branch 'master' into f21
    
    Conflicts:
    	upower.spec

 0005-lib-Fix-crash-on-uninitialized-variant.patch | 40 +++++++++++++++++++++++
 upower.spec                                       | 35 +++++++++++++++-----
 2 files changed, 66 insertions(+), 9 deletions(-)
---