[make/f16: 4/4] Merge branch 'master' into f16

[Petr Machata]

commit 4d6df140bb0c99cdb1a34a211cfba2b8553f8712
Merge: ad1f3dc d15338d
Author: Petr Machata <pmachata at redhat.com>
Date:   Thu Nov 3 10:37:19 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	make.spec

 make-3.82-parallel-remake.patch |   30 ++++++++++++++++++++++++++++++
 make.spec                       |    9 ++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---