merge of 4cfdadba6908591a58400b358f66aa5d7a5c2d9e
authorMichael Lauer <mickey@vanille-media.de>
Wed, 31 May 2006 15:46:29 +0000 (15:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 May 2006 15:46:29 +0000 (15:46 +0000)
commit4f33c9c183de6d97848c9c0302b8717251906144
tree87464fec873e496ab1b241b63edab133af94b13c
parentf0b7c45a78ccb9ac551797288f25e891c4031e56
parent5a4c3c8eb4bdc9e2d12fa9810467277dc7db877d
merge of 4cfdadba6908591a58400b358f66aa5d7a5c2d9e
     and fab9c0728e8095f1a2f9da508f583854558542f7