merge of 29709b7d5d5e2ec13e3b1968de4a6da6f657adbc
authorMichael Lauer <mickey@vanille-media.de>
Thu, 18 Aug 2005 09:46:07 +0000 (09:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Aug 2005 09:46:07 +0000 (09:46 +0000)
commit0d4ca551face6f67caf520ae1d3710111ba71b6a
tree9c0e585575cdad66cd0d19834da0c6a057e0b792
parent539c6c0d692ec97203e3591adb0f1d6727a19bbc
parentc1317a2b91f0afe2fbe460ab3b4abe6b487e8d00
merge of 29709b7d5d5e2ec13e3b1968de4a6da6f657adbc
     and b81b0e61bfce121f10d42e327ea1df89155f5110