[scons/f12/master: 5/5] Merge branch 'master' into f12

[supercyper]

commit 6894d7c7566f4f492e039415e55ed0e5a6905f93
Merge: 25082ca 5c85388
Author: Chen Lei <supercyper at 163.com>
Date:   Mon Aug 2 02:17:19 2010 +0800

    Merge branch 'master' into f12

 .gitignore |    2 +-
 scons.spec |    7 ++++---
 sources    |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---