From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 May 2010 21:31:50 +0000 (+0200)
Subject: Merge commit 'stevee/upstart' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b15b74690fa7c72fbb9142d07fa42b8e33b3526;p=ipfire-3.x.git

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

2b15b74690fa7c72fbb9142d07fa42b8e33b3526