Merge branch 'devel'
authorRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 14:42:45 +0000 (16:42 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 14:42:45 +0000 (16:42 +0200)

Trivial merge