[livecd-tools: 4/4] Merge branch 'f14'

[Bruno Wolff III]

commit 089461c6fd2fc91cf9b35a6b7f22cba0ae30f3f7
Merge: 2d3bc61 3146b6f
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Thu Sep 16 08:08:07 2010 -0500

    Merge branch 'f14'
    
    Conflicts:
    	livecd-tools.spec

 livecd-tools.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---