merge of '7c7739053ba5cdf8bff6f5a8f4fbc67e37462db4'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 17:34:13 +0000 (17:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 17:34:13 +0000 (17:34 +0000)
commit64fe0c0449e489d0fdb3f3dd589b1553eb433160
tree2a3648f01a5792582a2a4631449ec36d02afac03
parent35de05e61b88c0808a5e885bb0efdf420555d5ad
parent7f606dc35ddd665ff4d08f7a1759aabdb1cb70a9
Merge ... '7c7739053ba5cdf8bff6f5a8f4fbc67e37462db4'
     and 'e6a459c55425abe66caef6b80f6fab95fb04c868'