merged upstream

This commit is contained in:
Thomas Ruoff
2012-10-09 11:56:04 +02:00
parent bdba2e1b58
commit cc06b82413