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

[cheeselee]

commit 692221b26e1dbb90cb2fa45f65edfde1d57b4038
Merge: fef7a10 4474db4
Author: Robin Lee <robinlee.sysu at gmail.com>
Date:   Sat Aug 28 23:43:41 2010 +0800

    Merge branch 'master' into f14

 .gitignore |    1 +
 Zim.spec   |   15 ++++++++++-----
 sources    |    2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)
---