[wt/f18: 5/5] Merge branch 'master' into f18

[Michal Minar]

commit 98e6f3116dd78ff38d5af087f40233fab9785d43
Merge: 79ba4c7 01d1908
Author: Michal Minar <miminar at redhat.com>
Date:   Wed Dec 26 12:42:10 2012 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	sources
    	wt.spec

 .gitignore                 |    1 +
 sources                    |    1 +
 wt-3.2.3-PACKAGE-LICENSING |   13 +++++++++++++
 wt.spec                    |   29 +++++++++++++++--------------
 4 files changed, 30 insertions(+), 14 deletions(-)
---