merge of 5c10c32633c6d23ce9ff5b6ba59db4ca12198c88
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 5 Feb 2006 06:27:22 +0000 (06:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:27:22 +0000 (06:27 +0000)
commit8334dd645cd67983293e9fc88a55ef5fcab245da
treeae5cef60ad7ed6c18fde35f386af47be02520775
parentafdf03e6b04c6fb2bb83f8aff1cecd94280e93d6
parentc6ef2a3e30af363c4b9ca1e9bae81b1f2df16ce9
merge of 5c10c32633c6d23ce9ff5b6ba59db4ca12198c88
     and 8f6968ad1301cc31f3e3ac81867844322372a640