merge of 'd7806a43c44175ea7383681c5d772583a85125e1'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 23:35:01 +0000 (23:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 23:35:01 +0000 (23:35 +0000)
commit08338ad94452acfbdda3b910c7f6b7b7154fd357
tree925909eb2d745cf1abe065d662239e3f2c7022ce
parent541f656ea246ee025650961a2bac6c48e8ac0dde
parent936b86600b1a0daae20157a57f7e5945d7c35771
Merge ... 'd7806a43c44175ea7383681c5d772583a85125e1'
     and 'fa875ca906ae242732b2af7d423dc0a019709730'