Index: /main/waeup.kofa/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kofa/trunk/CHANGES.txt	(revision 16156)
+++ /main/waeup.kofa/trunk/CHANGES.txt	(revision 16157)
@@ -4,4 +4,8 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Prepare `renderPDFAdmissionLetter` for merging with another pdf document.
+
+* Add `picture_editable` property attribute to `ApplicantsContainer`.
 
 * Add webservice to check if graduated student exists.
Index: /main/waeup.kofa/trunk/setup.py
===================================================================
--- /main/waeup.kofa/trunk/setup.py	(revision 16156)
+++ /main/waeup.kofa/trunk/setup.py	(revision 16157)
@@ -40,4 +40,5 @@
     'zc.async[z3]',
     'z3c.evalexception',
+    'PyPDF2',
     ],
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py	(revision 16156)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py	(revision 16157)
@@ -23,4 +23,5 @@
 from time import time
 from cStringIO import StringIO
+from PyPDF2 import PdfFileMerger, PdfFileReader, PdfFileWriter
 from reportlab.lib import colors
 from reportlab.lib.units import cm
@@ -405,5 +406,5 @@
 
     def setPaymentDetails(self, category, student,
-            previous_session, previous_level, combi=[]):
+            previous_session=None, previous_level=None, combi=[]):
         """Create a payment ticket and set the payment data of a
         student for the payment category specified.
@@ -878,5 +879,6 @@
                                  pre_text=None, post_text=None,
                                  topMargin = 1.5,
-                                 letterhead_path=None):
+                                 letterhead_path=None,
+                                 mergefiles=None, watermark=None):
         """Render pdf admission letter.
         """
@@ -936,4 +938,32 @@
             note=post_text, topMargin=topMargin,
             letterhead_path=letterhead_path)
+        if mergefiles:
+            merger = PdfFileMerger()
+            merger.append(StringIO(pdf_stream))
+            if watermark:
+                watermark = PdfFileReader(watermark)
+            for file in mergefiles:
+                if watermark:
+                    # Pass through all pages of each file
+                    # and merge with watermark page.
+                    marked_file = PdfFileWriter()
+                    orig_file = PdfFileReader(file[1])
+                    num_pages = orig_file.getNumPages()
+                    for num in range(num_pages):
+                        page = orig_file.getPage(num)
+                        page.mergePage(watermark.getPage(0))
+                        marked_file.addPage(page)
+                    # Save into a file-like object
+                    tmp1 = StringIO()
+                    marked_file.write(tmp1)
+                    # Append the file-like object
+                    merger.append(tmp1)
+                else:
+                    # Just append the file object
+                    merger.append(file[1])
+            # Save into a file-like object
+            tmp2 = StringIO()
+            merger.write(tmp2)
+            return tmp2.getvalue()
         return pdf_stream
 
Index: /main/waeup.kofa/trunk/versions.cfg
===================================================================
--- /main/waeup.kofa/trunk/versions.cfg	(revision 16156)
+++ /main/waeup.kofa/trunk/versions.cfg	(revision 16157)
@@ -50,4 +50,5 @@
 Pygments = 2.0.2
 pyprof2calltree = 1.1.1
+PyPDF2 = 1.25.1
 reportlab = 2.5
 repoze.profile = 2.0
