merge of '9bdc778b4db6a77bfd983ea418ef07f57f411bcd'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 16 Nov 2007 13:04:18 +0000 (13:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 16 Nov 2007 13:04:18 +0000 (13:04 +0000)
commite78c37089a29ab51dc57927c7f0beeee5b5b9b9b
tree6ebdc5b0277a7cb61a2c917b990ed88e89a3efbb
parenta0d61640b5cc121fc7ab3d1bacf10e6d1829dbb1
parent48a8481494367ac4dfd7debfd4ca28913a077865
Merge ... '9bdc778b4db6a77bfd983ea418ef07f57f411bcd'
     and 'f04ba9d8f1f4caa6f8c95f3fec8cd70c6cde452c'