merge of 816ebd43bf288f81b3a0955f7374d24f7801c091
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 27 Jul 2005 10:04:19 +0000 (10:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jul 2005 10:04:19 +0000 (10:04 +0000)
commit8f080e76623f91e092b85f7aa6443825ab96b40c
tree18aacca3f2a9f6bb0d1913eae6e0463b7d5d3248
parent69c2f6f1aeb7add9599a1707583bcd0473775603
parent4390c09a12353882235a1cdf2c9f0059732f9fbb
merge of 816ebd43bf288f81b3a0955f7374d24f7801c091
     and ae6b1214d1469c259e0764a3b840cf18c4b9a2a3