[vidalia/f13/master: 8/8] Merge branch 'master' into f13

[Chen Lei]

commit 5a249271378c8adfb1d131e35afe00c5a4d2c246
Merge: dc40f9c 3bd5196
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 18 12:39:53 2010 +0800

    Merge branch 'master' into f13

 .gitignore   |    2 +-
 sources      |    2 +-
 vidalia.spec |   54 +++++++++++++-----------------------------------------
 3 files changed, 15 insertions(+), 43 deletions(-)
---