Merge branch 'master' into strings
authorHolger Lubitz <hal@duncan.ol.sub.de>
Wed, 1 Aug 2007 22:13:40 +0000 (00:13 +0200)
committerHolger Lubitz <hal@duncan.ol.sub.de>
Wed, 1 Aug 2007 22:13:40 +0000 (00:13 +0200)
commit58f5565eb04f08c51b4f123930294c3d033e3a8e
tree6df9ba9712544bad49f991006471f7e6c6511f84
parentf397fc443c7e798bb5491ca9ab2acef54c5fc0f0
parent24f32a1945537d7e1b5fbff1a09792a671b83bc3
Merge branch 'master' into strings