[maniadrive/f13/master: 5/5] Merge branch 'f14' into f13

[Remi Collet]

commit 612cb23f8b081e4a64ad94dce1146deb7ed1da2c
Merge: 9cfc8f1 e9fe968
Author: remi <fedora at famillecollet.com>
Date:   Tue Jan 11 19:31:41 2011 +0100

    Merge branch 'f14' into f13

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