merge of 'b2f17b7b5e7d3d3578983194a6e5733cc0d72d2b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 14:13:03 +0000 (14:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 14:13:03 +0000 (14:13 +0000)
commit8a3e21cc84fb3fc6c661089156287b82099eede5
treeea9884e118e7852e7b2a3a70edc734058f7983df
parent2dca5cdc6f9b240731b253d69c604034674ad314
parent44a478fb3839cc629053f61c33952ab30a3f65ac
Merge ... 'b2f17b7b5e7d3d3578983194a6e5733cc0d72d2b'
     and 'c03724e1451ef9439e526ac8b27ec4af5defecf9'