merge of '8728ab154063ad389826d041d5c22bd3587f3372'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Dec 2007 13:46:47 +0000 (13:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 25 Dec 2007 13:46:47 +0000 (13:46 +0000)
commit58d08348e701f6efb483546e39e029f3cb8df429
tree497d2d05fe75c3303145da0c487f508aa917ee26
parent28923e28feb20034efc37bb64132ed07679cc272
parentd7f9aa1735c0b9d589c11638cdf60d56267d431e
Merge ... '8728ab154063ad389826d041d5c22bd3587f3372'
     and 'acf2917a94a9bba36e944b0ad3ee532e3fc10eaf'