Merge branch 'gnome-2-26'
authorStefan Walter <Stefan Walter>
Sun, 3 May 2009 19:51:23 +0000 (14:51 -0500)
committerStefan Walter <Stefan Walter>
Sun, 3 May 2009 19:51:23 +0000 (14:51 -0500)
Conflicts:
ChangeLog
po/ca@valencia.po
po/uk.po


Trivial merge