From d29eaa100e5c63f490b44aaed88ff9bba0265fdd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 15:12:46 +0000
Subject: [PATCH] * Synced with trunk @ 15396, 15397 (-> configurations repo)

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