merge of '37149b3d7b17d35e06e93ecd95c7eb36f4425da6'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 8 Jan 2008 02:07:12 +0000 (02:07 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 8 Jan 2008 02:07:12 +0000 (02:07 +0000)
commit460978eb9e5ff4de83446a92096d65fa804b6d7b
tree333597b5f9487dc9bd07a2646e2b1f166f7d6c72
parentf99ef7e39e2df6f5482c9acc1bc6a6bcd865eef2
parent939f5d55c0e4e5d9b9f04f341c848cec4e226d6b
Merge ... '37149b3d7b17d35e06e93ecd95c7eb36f4425da6'
     and '562c973381fd0816ab9bc3ab53a276a6c274c8b2'