merge of 46db27fa739a4e4dbc48014380db5c6d2cbde37f
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 22:23:12 +0000 (22:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 22:23:12 +0000 (22:23 +0000)
commitf4156198b0d0399792402508b2d0854f106765b0
tree7c050ea870851ef17d588868cb9995d04beea21e
parentc01da5afd0487e11fb2a17ad3b7c8c423ee05039
parent9fc42a7dd92e6104ab7c4077507d93d35be7bf95
merge of 46db27fa739a4e4dbc48014380db5c6d2cbde37f
     and eedeac9741d0ad1da70a5545c21f0803a63bf9f0