From e58cd674018521b971acbe42ac42b4654456694b Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Sat, 2 Aug 2008 14:42:56 -0500
Subject: [PATCH] Merge branches 'master' and 'master' of
 ssh://jpgarch@complete.org/~jpgarch/git/offlineimap