[calibre/f14/master: 13/13] Merge remote branch 'origin/master' into f14 Updated to 0.7.18 and requires new python-cssutils Conf

[Kevin Fenzi]

commit eff891ccb5fe8c227721b0b70b97f197af50a74d
Merge: 6844bd9 37b4f18
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Wed Sep 15 13:33:11 2010 -0600

    Merge remote branch 'origin/master' into f14
    Updated to 0.7.18 and requires new python-cssutils
    Conflicts:
    	calibre.spec

 .gitignore   |    8 ++++++++
 calibre.spec |   49 ++++++++++++++++++++++++++++++++++++++++---------
 sources      |    2 +-
 3 files changed, 49 insertions(+), 10 deletions(-)
---