merge of '7a4784a76121e6cf9b4204ebe5c812e2e540767f'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 23:07:39 +0000 (23:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 23:07:39 +0000 (23:07 +0000)
commit8acaa71b400ffbfae66fb3ed2a5a7f7059a51537
tree9c2d73aba74061cf87eff460b5e5f197d1142a10
parenta308b53d3f43f9565bdf9cf0d90f29fe2e43e9a8
parentc41b91c42559b820c62a35c03eb60c33c3f134d1
Merge ... '7a4784a76121e6cf9b4204ebe5c812e2e540767f'
     and 'b5b94ebf56fcb87ac967b302ae3570b7f59d3dc2'