merged upstream

This commit is contained in:
Thomas Ruoff
2012-08-24 00:40:19 +02:00
parent 32f5966471
commit 0ab876df37