merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 5 Apr 2008 22:07:14 +0000 (22:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 5 Apr 2008 22:07:14 +0000 (22:07 +0000)
commitbf39bb6e3fabae6da5f9b8084f8d478f07e4836c
treefa86a0ab3b29ca6e78f34c99ba3b649d8e6a344a
parent2b5295d1ca8c5f876e8b6a5592706b751f03a401
parent58ec003f0bbcaaa89c6080b675726bac9b952e29
Merge ... '2bc71b9b93f22417784c3a4ed3576a76841878f2'
     and 'edac95232b05ccd8efaeee530e0442683d1ef50a'