Merge conflicts
authorRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 14:19:08 +0000 (16:19 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 14:19:08 +0000 (16:19 +0200)

Trivial merge