merge of '1549b0afc63f5679fb6877ec547a593b858995b3'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 23 Aug 2007 09:23:26 +0000 (09:23 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 23 Aug 2007 09:23:26 +0000 (09:23 +0000)
commit41afef488c3a36be56bd8de7fcdd7a560239f110
tree11b217e46ade4b7a78e0f9b163d28ab0c0a8366a
parent152f0766fdcf4df7faa2a73b9b2994b767049064
parent3d384474542b0110948779d19fc800b555d3f7f0
Merge ... '1549b0afc63f5679fb6877ec547a593b858995b3'
     and '6cbb49635ec4afa8bf5ebeada5a97affa422d676'