From 4f2de9a0ba5ea445c423751b6eac252adf39d5a2 Mon Sep 17 00:00:00 2001
From: naufraghi <naufraghi@8dd32b29-ccff-0310-8a9a-9233e24343b1>
Date: Thu, 13 Nov 2008 13:42:33 +0000
Subject: [PATCH] Blocked revisions 546 via svnmerge

........
  r546 | naufraghi | 2008-11-13 14:36:29 +0100 (Thu, 13 Nov 2008) | 1 line

  Restore lost-in-merge carchive crypt
........


git-svn-id: http://svn.pyinstaller.org/trunk@548 8dd32b29-ccff-0310-8a9a-9233e24343b1