merge of 'a6e949d7541dc3ab2d5697151c861cfd4a2efa87'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 21:38:11 +0000 (21:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 21:38:11 +0000 (21:38 +0000)
commit0a3b5ec1ca116bb7fa92bf663d514ff21b8b4644
tree5a649d783b245510bea7e003728e7f3c70cba7bc
parent026cc7619f092f92adbcfc5dbbb0894a72ac3a32
parenteb3d6b98088530a7fc177e00cbbdb09d9a270775
Merge ... 'a6e949d7541dc3ab2d5697151c861cfd4a2efa87'
     and 'f710df9bab62719eadc5ac425bbc8e07f2e5f704'