merge of '1c2a066fe666a7ab871c0b647aa7557802e7960c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 20 Feb 2008 17:12:37 +0000 (17:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 20 Feb 2008 17:12:37 +0000 (17:12 +0000)
commit6836f43ea4f5dffc94d623c01cf3c39b56af8eef
tree4467e76d7a75e13d93d0060236c6ce40deacf499
parent92706f4159bbbd015f9b032815589491d8ce08cb
parent3d958d91ab81200fb1d53233e5855e08b5f56bbc
Merge ... '1c2a066fe666a7ab871c0b647aa7557802e7960c'
     and 'abff11b5d16c4babe2a2dc6adcf2fd393aea57d1'