From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Mar 2010 11:47:43 +0000 (+0100)
Subject: Merge commit 'stevee/nasm' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae1d2740f141e3cdb0739f35368bae5ee50f1f4;p=ipfire-3.x.git

Merge commit 'stevee/nasm' into next
---

eae1d2740f141e3cdb0739f35368bae5ee50f1f4