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

[Luke Macken]

commit 3ec7f5dce8e6be74778c948896ff3e27203d85b7
Merge: 73302e5 4adbfc8
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Nov 27 00:31:39 2014 -0700

    Merge branch 'master' into el6

 .gitignore           |    1 +
 liveusb-creator.spec |   40 ++++++++++++++++++++++++++--------------
 sources              |    2 +-
 3 files changed, 28 insertions(+), 15 deletions(-)
---