[kobo/f17: 3/3] Merge remote-tracking branch 'origin/f16' into f17

Wed Apr 18 06:24:06 UTC 2012

commit 806f782facef4c8187b192d4add750439ad389e0
Merge: b6e5c75 a79a744
Author: Daniel Mach <dmach at redhat.com>
Date:   Wed Apr 18 08:23:57 2012 +0200

    Merge remote-tracking branch 'origin/f16' into f17

 .gitignore |    1 +
 kobo.spec  |   16 ++++++++++------
 sources    |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
---