[lnst/f18: 4/4] Merge branch 'master' into f18

[Radek Pazdera]

commit 19d197953acf1e5ed513f350ecf2a36ab419311e
Merge: 17cbfed adfe620
Author: Radek Pazdera <rpazdera at redhat.com>
Date:   Thu Oct 10 12:14:13 2013 +0200

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

 .gitignore |    2 ++
 lnst.spec  |   33 ++++++++++++++++++++-------------
 sources    |    2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)
---