[apper/f18: 3/3] Merge branch 'master' into f18

[Rex Dieter]

commit d60d83ec3da17a4abc93d0a099fe66dddc9a4cf7
Merge: 301a97c a1a4a25
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 13:47:02 2012 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	apper.spec

 apper.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---