merge of 2d917a9725f84078c390a35764f260c9abbef0f6
authorMichael Lauer <mickey@vanille-media.de>
Sun, 5 Mar 2006 16:22:01 +0000 (16:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Mar 2006 16:22:01 +0000 (16:22 +0000)
commit8e9b731907f73dd0488ebdc1ef9a89d0ce62c3cd
treeb4ebed6dc8d46792d704ad5b7a71647a1d731cfd
parent3686bc485ab3c4ba9e5528b3b9a2cc668cf4332a
parent8a2b8144cefd14569c2c1bfd8c84cfac593e41c1
merge of 2d917a9725f84078c390a35764f260c9abbef0f6
     and 4a411456169f13d81227a8f0f0087490f6b68814