Merge branch 'config-variables-unification' into 263
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 19 Jan 2011 16:16:29 +0000 (17:16 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 19 Jan 2011 16:16:29 +0000 (17:16 +0100)

Trivial merge