[presence/f17: 4/4] Merge branch 'master' into f17

[Fabian Deutsch]

commit 41dff2501f572c541e41b4139d9e4c77d91f4690
Merge: 093cd49 cdc46b1
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date:   Wed May 2 22:22:59 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	presence.spec
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>

 .gitignore           |    1 +
 presence-build.patch |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++
 presence.spec        |   14 +++++--
 sources              |    2 +-
 4 files changed, 113 insertions(+), 5 deletions(-)
---
diff --cc presence.spec
index 08954a8,53887f6..91a600d
--- a/presence.spec
+++ b/presence.spec
@@@ -52,10 -55,10 +55,13 @@@ desktop-file-validate %{buildroot}/%{_d
  
  
  %changelog
+ * Wed May 02 2012 Fabian Deutsch <fabian.deutsch at gmx.de> - 0.4.6-1
+ - Update to latest upstream
+ 
 -* Wed Mar 14 2012 Fabian Deutsch <fabian.deutsch at gmx.de> - 0.4.5-4
 +* Sat Mar 10 2012 Matthias Clasen <mclasen at redhat.com> - 0.4.5-5
 +- Rebuild against new cogl
 +
 +* Sun Feb 26 2012 Matthias Clasen <mclasen at redhat.com> - 0.4.5-4
  - Rebuild against new cogl
  
  * Fri Jan 20 2012 Fabian Deutsch <fabiand at fedoraproject.org> - 0.4.5-3