[kphotoalbum/f13/master: 7/7] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 48abf7209940b9355f2a43de2045a073f464f4cd
Merge: 2ed3172 9dba68e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 30 06:18:50 2010 -0500

    Merge remote branch 'origin/master' into f13/master

 kphotoalbum-4.1.1-docbook_fix.patch |  236 +++++++++++++++++++++++++++++++++++
 kphotoalbum.spec                    |   12 ++-
 2 files changed, 246 insertions(+), 2 deletions(-)
---