Code

Merged branch 'configsplit'.
authorSebastian Harl <sh@tokkee.org>
Mon, 18 Mar 2013 04:57:06 +0000 (05:57 +0100)
committerSebastian Harl <sh@tokkee.org>
Mon, 18 Mar 2013 04:57:06 +0000 (05:57 +0100)

Trivial merge