[zathura/f14/master: 3/3] Merge branch 'master' into f14

[Rex Dieter]

commit bb79ec0757d9714009cb546f47f24dddb686be0d
Merge: 366c564 8760b0d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 20 10:14:06 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	zathura.spec

 zathura.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---