From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 15 Aug 2012 17:22:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'bergundy/upstream'
X-Git-Tag: v2.4.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=986f415ec22a33ef6dfa9a59bf8ad85d2ea6a932;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'bergundy/upstream'
---

986f415ec22a33ef6dfa9a59bf8ad85d2ea6a932