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

[Fabian Affolter]

commit 83da3e601551a6c9c4fc000c07e801be20eb5465
Merge: 7560ca1 c7e275c
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Sun Sep 11 19:02:40 2011 +0200

    Merge branch 'master' into f14

 .gitignore |    1 +
 scons.spec |   39 +++++++++++++++++++++++++--------------
 sources    |    2 +-
 3 files changed, 27 insertions(+), 15 deletions(-)
---