[liveusb-creator/el6: 5/5] Merge branch 'master' into el6

[Luke Macken]

commit 454c8cbe6b4990688039d9a722617fcd9628c62f
Merge: e3124f8 531b2f8
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Jun 12 13:18:05 2012 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	liveusb-creator.spec
    	sources

 .gitignore           |    1 +
 liveusb-creator.spec |   12 +++++++++++-
 sources              |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---