From 99154aa6d615555baef8cf850db780f6e93585d0 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 25 Sep 2010 15:24:59 -0400
Subject: [PATCH] Merge branches 'feature/import-seamless' and
 'feature/imports' into feature/imports