[bakefile/f13/master: 7/7] Merge branch 'master' into f13

[Filipe Rosset]

commit 5014bd3a698baf9e94f562787382020e185099c3
Merge: 178ffbb fd39480
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Sun Jan 2 15:17:39 2011 -0200

    Merge branch 'master' into f13
    
    Conflicts:
    	bakefile.spec

 bakefile-028-fix-import.patch |   33 +++++++++++++++++++++++++++++++++
 bakefile.spec                 |   11 ++++++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---