[control-center: 8/8] Merge branch 'f16'

[Tomas Bzatek]

commit 1e1a545f3bf7e94f3976f7e31a9faf3271c06bb0
Merge: a876fe0 fe00536
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Aug 26 14:38:00 2011 +0200

    Merge branch 'f16'
    
    Conflicts:
    	control-center.spec

 .gitignore                                         |    1 +
 ...d-a-crash-in-the-absence-of-configured-la.patch |   43 ++++++++++++++++++++
 control-center.spec                                |   20 ++++++++-
 sources                                            |    2 +-
 4 files changed, 63 insertions(+), 3 deletions(-)
---
diff --cc control-center.spec
index fb0de1b,423f9a1..ae7ff94
--- a/control-center.spec
+++ b/control-center.spec
@@@ -223,8 -230,17 +230,17 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
+ * Mon Aug 22 2011 Matthias Clasen <mclasen at redhat.com> 3.1.5-3
+ - Fix a crash without configured layouts
+ 
+ * Fri Aug 19 2011 Matthias Clasen <mclasen at redhat.com> 3.1.5-2
+ - Obsolete control-center-devel
+ 
+ * Thu Aug 18 2011 Matthias Clasen <mclasen at redhat.com> 3.1.5-1
+ - Update to 3.1.5
+ 
 -* Wed Aug 17 2011 Matthias Clasen <mclasen at redhat.com> 3.1.4-2
 -- Rebuild
 +* Wed Aug 17 2011 Christoph Wickert <cwickert at fedoraproject.org> - 3.1.4-2
 +- Fix autostart behavior (#729271)
  
  * Mon Jul 25 2011 Matthias Clasen <mclasen at redhat.com> 3.1.4-1
  - Update to 3.1.4