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

[Chen Lei]

commit fa2a8ca5ffd21227a9ca4c739fce9e02e03d3913
Merge: 4602844 64072ff
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 18 12:36:35 2010 +0800

    Merge branch 'master' into f12

---