merge of '014e04809d6848b8f7c4ce43e57a9e89857ed8c9'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 11:28:04 +0000 (11:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 11:28:04 +0000 (11:28 +0000)
commita0a8127e2c74b23889e63ad749f8d9949f1fca2b
tree39b6466184e2480a141bbae6e751bde7f2dbe184
parent208af423541601a2a24d128ceac95ccfe2c2cc61
parentb682d86e68326fdb6d23537bb3bddb053cba492d
Merge ... '014e04809d6848b8f7c4ce43e57a9e89857ed8c9'
     and '312397dbc5a5ae102fde8714c41666b07b74ee8a'