merge of '2ee8158109b81fad266d6373b64175e13ea659e4'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 22:44:02 +0000 (22:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 22:44:02 +0000 (22:44 +0000)
commit6a9276de8f5d2f6f1f4826659b4fbb00cd4b694f
tree0439e152089ee7167a75f1038a18bdb7b6fe3359
parent02c3dce797180ae9392503ff75f984f9d5599016
parent873d048d895290f6784e2d6a42721361834f6ad8
Merge ... '2ee8158109b81fad266d6373b64175e13ea659e4'
     and 'f2a34edab33cdaedb8303991dc23cc54c1c370ff'