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

[Chen Lei]

commit e7a201b87d450f48c6d0745ae7643b61b9b068dd
Merge: 6894d7c 2049ca1
Author: Chen Lei <supercyper at 163.com>
Date:   Tue Aug 24 02:02:06 2010 +0800

    Merge branch 'master' into f12

 .gitignore |    2 +-
 scons.spec |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---