From 778bf12b988dbe2e246b535eee3925465cb6abda Mon Sep 17 00:00:00 2001
From: Petar Maymounkov <petar@tumblr.com>
Date: Sat, 14 Jul 2012 18:11:08 -0400
Subject: [PATCH] Merge branch 'master' of github.com:tumblr/platform