Merge branch 'software-vars'
authorSebastian Pipping <sebastian@pipping.org>
Sun, 12 Aug 2012 23:22:13 +0000 (01:22 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 12 Aug 2012 23:22:13 +0000 (01:22 +0200)

Trivial merge