[gnome-keyring: 3/3] Merge branch 'gnome-2-26'

[Stefan Walter <stefw src gnome org>]

commit cb32f8b10ca51afa699afdaf339029aa5fbd0e74
Merge: 6c92cd1... eccba13...
Author: Stef Walter <stef memberwebs com>
Date:   Mon Jul 13 17:18:45 2009 +0000

    Merge branch 'gnome-2-26'

 NEWS         |    6 ++++++
 configure.in |   16 ++++++++--------
 po/ChangeLog |    2 ++
 3 files changed, 16 insertions(+), 8 deletions(-)
---
diff --cc po/ChangeLog
index f7bf250,54f6f25..c120f5d
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@@ -1,6 -1,8 +1,8 @@@
+ === gnome-keyring 2.26.3 ===
+ 
  2009-06-10  Manoj Kumar Giri <mgiri redhat com>
  
 -	* hi.po: Committed Hindi Translation on behalf of Rajesh Ranjan.
 +	* hi.po: committed Hindi Translation on behalf of Rajesh Ranjan.
  
  === gnome-keyring 2.26.1 ===