From bfd70025920082a59f64fcdd25b52c9259b4edda Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 26 May 2011 08:39:03 +0200
Subject: [PATCH] r1571