From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 22 Jan 2012 20:20:39 +0000 (-0800)
Subject: Merge pull request #1101 from ansman/2.0-wip
X-Git-Tag: v2.0.0~6^2~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6eb972bf3f1a0ea172a44a25565df18da615f33;p=thirdparty%2Fbootstrap.git

Merge pull request #1101 from ansman/2.0-wip

Fix for #1102 and #1100
---

a6eb972bf3f1a0ea172a44a25565df18da615f33