merge of 'b7526fb97989513a85163a319269dac86b19a85c'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 00:27:56 +0000 (00:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 00:27:56 +0000 (00:27 +0000)
commit6b473161fd02ea1a5d9bc3006738b8307f2eca01
tree1aab76f3cd255df8fe05fc64d57dd812eea1dde2
parent9ec5a6efc4fb8ff5e5f2dd0f09a10b30cd685c65
parent9c6a4739250e77bd66c7e1d5b40f8a856a2d311a
Merge ... 'b7526fb97989513a85163a319269dac86b19a85c'
     and 'e0d71aa6a8738794986f1833521cdcb515df1ae7'