[gdesklets/f14/master: 3/3] Merge branch 'master' into f14

[Luya Tshimbalanga]

commit 212ca6d3d036fcc5dc85c0c28c35a2c6a97b713e
Merge: 39813e0 eb81e2c
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Thu Jan 27 00:38:10 2011 -0800

    Merge branch 'master' into f14
    
    Conflicts:
    	gdesklets.spec

 .gitignore     |    1 +
 gdesklets.spec |   16 +++++++++++-----
 sources        |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --cc gdesklets.spec
index ddbbd99,e0f9606..604d6d9
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@@ -81,6 -81,9 +81,12 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Jan 26 2011 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-1
+ - New upstream version
+ 
++>>>>>>> master
  * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.36.2-3
  - recompiling .py files against Python 2.7 (rhbz#623304)