commit 13cbc5d651aa921bb037a117c70531f840d535fb Merge: b3b5371 db214db Author: Matthias Clasen <mclasen at redhat.com> Date: Wed Dec 21 11:30:39 2011 -0500 Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnome-screenshot ---