merge

2 files changed, 17 insertions, 2 deletions

diff --git a/sphinx/__main__.py b/sphinx/__main__.py
new file mode 100644
index 00000000..ee8419b7
--- /dev/null
+++ b/sphinx/__main__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+    Sphinx
+    ~~~~~~
+
+    The Sphinx documentation toolchain.
+
+    :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+import sys
+from sphinx import main
+
+sys.exit(main(sys.argv))
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 1c915431..04dd7013 100644..100755
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -742,14 +742,14 @@ class LaTeXTranslator(nodes.NodeVisitor):
         # Redirect head output until header is finished. see visit_tbody.
         self.body = self.tableheaders
     def depart_thead(self, node):
-        self.body.append('\\hline')
+        pass
 
     def visit_tbody(self, node):
         if not self.table.had_head:
             self.visit_thead(node)
         self.body = self.tablebody
     def depart_tbody(self, node):
-        self.body.append('\\hline')
+        pass
 
     def visit_row(self, node):
         self.table.col = 0
@@ -757,6 +757,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         if self.previous_spanning_row == 1:
             self.previous_spanning_row = 0
         self.body.append('\\\\\n')
+        self.body.append('\\hline')
         self.table.rowcount += 1
 
     def visit_entry(self, node):