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

[Luke Macken]

commit def47a9980e2e5c17d5a22be0890599da5f6bff7
Merge: 595e88e d316bbd
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Jan 10 16:15:53 2011 -0500

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

 .gitignore           |    2 +-
 liveusb-creator.spec |    7 ++++++-
 sources              |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 438293d,18416a4..d979a37
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--liveusb-creator-3.9.2.tar.bz2
+ liveusb-creator-3.9.3.tar.bz2
diff --cc liveusb-creator.spec
index ca6c08f,2863dc1..8f84ecf
--- a/liveusb-creator.spec
+++ b/liveusb-creator.spec
@@@ -68,6 -69,13 +69,10 @@@ rm -rf %{buildroot
  %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
  
  %changelog
+ * Mon Jan 10 2011 Luke Macken <lmacken at redhat.com> - 3.9.3-1
+ - Update to 3.9.3
+ - Require syslinux-extlinux (#664093, #665002)
+ 
 -* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 3.9.2-2
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
  * Tue Jun 15 2010 Luke Macken <lmacken at redhat.com> - 3.9.2-1
  - 3.9.2