From 68238f3c513c0289282d449ca6ed57a97812771d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 29 May 2011 08:25:31 +0200
Subject: [PATCH] r1590