From f6a02fa6fa539548cf7279336f615d5b35d77f41 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Tue, 28 Sep 2010 18:41:14 +0100
Subject: [PATCH 1/2] Fix blank line

Fixes: https://launchpad.net/bugs/649999
---
 openlp/core/lib/renderer.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index f97575c5e..d5bcab457 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -161,8 +161,9 @@ class Renderer(object):
         html_text = u''
         styled_text = u''
         for line in text:
-            styled_line = expand_tags(line) + line_end
-            styled_text += styled_line
+            styled_line = expand_tags(line)
+            if styled_text:
+                styled_text += line_end + styled_line
             html = self.page_shell + styled_text + u'</div></body></html>'
             self.web.setHtml(html)
             # Text too long so go to next page
@@ -171,6 +172,8 @@ class Renderer(object):
                 html_text = u''
                 styled_text = styled_line
             html_text += line + line_end
+        if line_break:
+            html_text = html_text[:len(html_text)-4]
         formatted.append(html_text)
         log.debug(u'format_slide - End')
         return formatted

From 0f480a6dd500f7f12243c677de48fe260c1e724f Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Wed, 29 Sep 2010 17:48:45 +0100
Subject: [PATCH 2/2] Fix loading of service items bug

Fixes: https://launchpad.net/bugs/651076
---
 openlp/core/lib/serviceitem.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index e7ec9c2af..398606422 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -306,6 +306,7 @@ class ServiceItem(object):
                 filename = os.path.join(path, text_image[u'title'])
                 self.add_from_command(
                     path, text_image[u'title'], text_image[u'image'] )
+        self._new_item()
 
     def merge(self, other):
         """