merge of '17fe5a20eddea57fb860ffa0652cc78cda424804'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 23:26:41 +0000 (23:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 23:26:41 +0000 (23:26 +0000)
commit507f5c47f31dc102d925959788af4ae8ddb5f6c9
tree4ba3ccb6fcc4ab1dba6d51d35cffe4097298961b
parentdc9e3345fd087227731b17379aa46e1b8ee2d9b6
parente737833493b9017bbfd3ab0dba6a2d26f85eebd8
Merge ... '17fe5a20eddea57fb860ffa0652cc78cda424804'
     and '281a5681239793312291488e7b216ecbdfce9b33'