merge of f8284bbff196fac15cb8c1b32ae2ac3dcda6a7a8
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jan 2006 15:39:17 +0000 (15:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 15:39:17 +0000 (15:39 +0000)
commit8d60e06669abb89149ba60248ee6b72b6a274f04
treedc9ad8f68c8a099e04a9539ac510b9f089a66188
parent4a3c0e80ef889e31d0a09530ba9e6877b75f1965
parent9c62a6b5ca6c606d670955061ae4f570270aa3af
merge of f8284bbff196fac15cb8c1b32ae2ac3dcda6a7a8
     and 856b33429f931b2e6a9dab859111ff4c8b6111c2