Merge branch 'master' of aristoteles.sthu.org:~/gitweb/shutils
authorStefan Huber <shuber2@gmx.at>
Thu, 15 Nov 2012 10:10:52 +0000 (11:10 +0100)
committerStefan Huber <shuber2@gmx.at>
Thu, 15 Nov 2012 10:10:52 +0000 (11:10 +0100)

Trivial merge