[vidalia/f12/master: 12/12] Merge branch 'master' into f12

[Chen Lei]

commit 446bec3f8506dd07fa3b10d66f6da53a60fd673e
Merge: fa2a8ca 3bd5196
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 18 12:40:28 2010 +0800

    Merge branch 'master' into f12

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