[gnome-documents/f17: 2/2] Merge commit '6ffea6b4682842675f0fb717974ed5ed58b94d2f' into f17

[Adam Williamson]

commit f8da380a2f27be41883e4c7263a847ab0e2d18da
Merge: 75d726c 6ffea6b
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Mar 20 16:16:42 2012 -0700

    Merge commit '6ffea6b4682842675f0fb717974ed5ed58b94d2f' into f17

 gnome-documents.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---