merge of 282bd719dad582050c3698357176c4c2a53181da
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 7 Feb 2006 08:09:48 +0000 (08:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 08:09:48 +0000 (08:09 +0000)
commit51c5a200c7290e8d8a20ae8d4bb0d51684125e04
treebf142f9028bdaf80a64647d01130064ac3c359d9
parent3df2bda183432d96a58fcabfe6d0e5812b098a1e
parent4fc48e94ff44f6bcd110ed16c53e0e2a589c689f
merge of 282bd719dad582050c3698357176c4c2a53181da
     and 7bd8e93854d7d1cbf3ae66788c128c85d9f80d0d