merge of '09258eafc3e7182a15978e372af12800698031ce'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 16:31:07 +0000 (16:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 16:31:07 +0000 (16:31 +0000)
commit3ccda8bedb75a5717bdeb89ae7ccd5db8235b876
treeb5f4b15fba0e30254c625b2d446b7e0f8291684e
parentfe282cdede0f3aa59e17c3e121161da7e478ec92
parent6e12a46abf54dd10e635210137f91f7269b88c95
Merge ... '09258eafc3e7182a15978e372af12800698031ce'
     and '96d88977407dc82a4987de86d47802dd8322556f'