From e0ccd20510887340302e9d9dd623fafdeba94692 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Wed, 25 Jul 2007 09:26:20 +0000
Subject: [PATCH] Merge branch 'nginx' into up