From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 10 Sep 2012 03:52:13 +0000 (-0700)
Subject: Merge commit 'ebf17aa'
X-Git-Tag: v3.0.0~272^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ae398888a3229bbdef4c2e650796c44d0dcd88;p=thirdparty%2Ftornado.git

Merge commit 'ebf17aa'

Closes #585.
---

f1ae398888a3229bbdef4c2e650796c44d0dcd88