From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Feb 2010 11:20:02 +0000 (+0100)
Subject: Merge remote branch 'stevee/naoki'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bdbde5d6ec17a344e441c1f4def6fc088251467;p=ipfire-3.x.git

Merge remote branch 'stevee/naoki'

Conflicts:
	pkgs/core/sqlite/sqlite.nm
---

7bdbde5d6ec17a344e441c1f4def6fc088251467