[libburn/el5/master: 23/23] Merging with master (sources repaired).

[Jan Horak]

commit 92f9a64a193809a8cc6e8db48262c758ce2c33d8
Author: Honza Horak <hhorak at redhat.com>
Date:   Mon Feb 28 13:54:35 2011 +0100

    Merging with master (sources repaired).

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index d60e867..43d9d46 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0cfe4daff5d36284d03ed8170eecac7c  libburn-0.4.0.tar.gz
-=======
 34ebee1dc4a4933c933f9701825a435a  libburn-1.0.2.pl00.tar.gz
->>>>>>> master