Merge branch 'develop'
authorchristian <christian@genivialex.(none)>
Thu, 11 Aug 2011 20:21:06 +0000 (22:21 +0200)
committerchristian <christian@genivialex.(none)>
Thu, 11 Aug 2011 20:21:06 +0000 (22:21 +0200)

Trivial merge