[apper/f16: 5/5] Merge branch 'master' into f16

[Rex Dieter]

commit cf100b42d46081623d8ebbaa66480436ef3cd191
Merge: 80af45c f22af42
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Feb 18 03:17:30 2012 -0600

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

 .gitignore |    1 +
 apper.spec |   13 +++++++++++--
 sources    |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---