merge of 0aa8013267614c94b0122ab5b95c006413d93be2
authorMichael Lauer <mickey@vanille-media.de>
Mon, 11 Jul 2005 21:00:21 +0000 (21:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jul 2005 21:00:21 +0000 (21:00 +0000)
commit659282a06d74bef7b0d9cb5e11bca2e10361cdb6
treef99b5295d6bce98d7196df3e9aa657c8f56e64ea
parent6c15bff9b38d0fd2e6d13970a1ee5ba335a7948c
parent8c7db72bd3cf04c6a62b5155621db7213b63e4c2
merge of 0aa8013267614c94b0122ab5b95c006413d93be2
     and 24a509421f0088ff76c3cdd4736508a7c4b02a86