From d1c1f38407cf41449913e9bb36e2d7c24d08ba0c Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 12 May 2011 17:36:06 +0200
Subject: [PATCH] r1534