From fe16ffc552b2607d1f641414cb2cbcd9b7fe19ea Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 19 May 2009 23:43:24 +0000
Subject: [PATCH] Synced with trunk @ 15633 (patch was merged previously)

svn path=/nixos/branches/modular-nixos/; revision=15664