[control-center: 26/26] Merge branch 'f15'

[Tomas Bzatek]

commit d37c80358482bbd17d94241efe4f2f85e25124db
Merge: b483c34 242312c
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Thu Apr 21 16:08:18 2011 +0200

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

 .gitignore                                         |    6 +
 ...-language-names-for-locales-with-3-letter.patch |  131 ---------
 0001-datetime-Fix-crash-when-TZ-is-an-alias.patch  |  280 --------------------
 ...-a-Other.-entry-to-the-wireless-combobox-.patch |  211 +++++++++++++++
 control-center.spec                                |  102 ++++++--
 gnome-sound-applet.patch                           |    8 +
 org.gnome.control-center.defaultbackground.policy  |   21 --
 sources                                            |    2 +-
 8 files changed, 312 insertions(+), 449 deletions(-)
---
diff --cc control-center.spec
index ba8f9f0,c0a4c78..328cef1
--- a/control-center.spec
+++ b/control-center.spec
@@@ -238,8 -259,56 +260,56 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
- * Mon Feb 14 2011 Bastien Nocera <bnocera at redhat.com> 2.91.6-10
- - Disable libsocialweb support for now
+ * Thu Apr  7 2011 Matthias Clasen <mclasen at redhat.com> 3.0.0.1-3
 -- Only autostart the sound applet in GNOME
 -3
++- Only autostart the sound applet in GNOME 3
++
+ * Wed Apr  6 2011 Matthias Clasen <mclasen at redhat.com> 3.0.0.1-2
+ - Add a way to connect to hidden access points
+ 
+ * Wed Apr  6 2011 Matthias Clasen <mclasen at redhat.com> 3.0.0.1-1
+ - Update to 3.0.0.1
+ 
+ * Mon Apr 04 2011 Bastien Nocera <bnocera at redhat.com> 3.0.0-1
+ - Update to 3.0.0
+ 
+ * Mon Mar 28 2011 Matthias Clasen <mclasen at redhat.com> 2.91.93-1
+ - 2.91.93
+ 
+ * Fri Mar 25 2011 Matthias Clasen <mclasen at redhat.com> 2.91.92-4
+ - Rebuild against newer cheese
+ 
+ * Thu Mar 24 2011 Matthias Clasen <mclasen at redhat.com> 2.91.92-3
+ - Rebuild against NetworkManager 0.9
+ 
+ * Mon Mar 21 2011 Matthias Clasen <mclasen at redhat.com> 2.91.92-1
+ - Update to 2.91.92
+ 
+ * Thu Mar 17 2011 Ray Strode <rstrode at redhat.com> 2.91.91-6
+ - Drop incomplete "Supervised" account type
+   Resolves: #688363
+ 
+ * Tue Mar 15 2011 Bastien Nocera <bnocera at redhat.com> 2.91.91-5
+ - We now replace desktop-effects, with the info panel (#684565)
+ 
+ * Mon Mar 14 2011 Bastien Nocera <bnocera at redhat.com> 2.91.91-4
+ - Add gnome-icon-theme-symbolic dependency (#678696)
+ 
+ * Wed Mar 09 2011 Richard Hughes <rhughes at redhat.com> 2.91.91-3
+ - Ensure we have NetworkManager-glib-devel to get the network panel
+ - Explicitly list all the panels so we know if one goes missing
+ 
+ * Tue Mar  8 2011 Matthias Clasen <mclasen at redhat.com> 2.91.91-2
+ - Rebuild against NetworkManager 0.9, to get the network panel
+ 
+ * Tue Mar 08 2011 Bastien Nocera <bnocera at redhat.com> 2.91.91-1
+ - Update to 2.91.91
+ - Disable libsocialweb support until Flickr integration is fixed upstream
+ 
+ * Mon Feb 28 2011 Matthias Clasen <mclasen at redhat.com> - 1:2.91.90-2
+ - Fix a typo in the autostart condition for the sound applet
+ 
+ * Tue Feb 22 2011 Matthias Clasen <mclasen at redhat.com> - 1:2.91.90-1
+ - Update to 2.91.90
  
  * Sun Feb 13 2011 Christopher Aillon <caillon at redhat.com> - 1:2.91.6-9
  - Rebuild against new libxklavier