merge of '7c0a885daa3893962bf21628fe340b191ecb0259'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 15:28:23 +0000 (15:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 15:28:23 +0000 (15:28 +0000)
commit20b7f38ce5b7a6c562778d01164df8efc12b512a
tree476f91f1a5dc5120b08ee6063ffbadd013805a59
parent3f4428a1a467d2e10b64d849699008476bcd0830
parentcdd1cf3fc9732b6bc5437f53293f445472cf875c
Merge ... '7c0a885daa3893962bf21628fe340b191ecb0259'
     and 'fdb543591628f771630c9bdf28e86d3e0911be03'