Commit 050e8877dda969b62f47a180b865a4447785e9c7

Jakob Pfender 2011-05-17T15:31:05

Merge branch 'development' into unmerged