merge of '1d05bbd701cd09434dbcc309dc00e37c3f1e2b54'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jun 2007 10:47:22 +0000 (10:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jun 2007 10:47:22 +0000 (10:47 +0000)
commit91a4388298413bfddc26a5d67e997654624dde92
treeea2e71a713cc9742296574e3e280014029707b88
parenteb273850bfee1fb85aebc7892f3ad6a9444ed002
parent0147108905c342621fe7a2aaa7a5dad59c940aee
Merge ... '1d05bbd701cd09434dbcc309dc00e37c3f1e2b54'
     and 'd56afe7fa243cd0f2feab2dd537cc8dbfe1d91fc'