Merge from main branch

This commit is contained in:
Oliver Graf 2012-07-27 19:41:19 +02:00
parent 30ec259b70
commit d13539ddaa