commit f4595c626d72dc8b0b4b687f93fa6ba9cf5a9b4e Merge: 47573bd c962d43 Author: Brendt Wohlberg <osspkg at gmail.com> Date: Fri Nov 19 18:37:21 2010 -0700 Merge branch 'master' of ssh://pkgs.fedoraproject.org/photoml ---