commit e3b6e2a37967bb73eddeb04981bd0cf0bbc4da82 Merge: 3c4b7a6 24c23b3 Author: Shaun McCance Date: Mon May 23 20:44:16 2011 -0400 Merge branch 'gnome-3-0' Conflicts: doc/yelp-xsl/de/de.po po/bg.po po/cs.po po/es.po po/sv.po