merge of 9163a4b2aa3f51ec4fd9c17fbf7e8cacf1c0f767
authorJamie Lenehan <lenehan@twibble.org>
Sun, 28 May 2006 02:38:36 +0000 (02:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 May 2006 02:38:36 +0000 (02:38 +0000)
commitb3481251eddee8369eed4ab7645e45390312fd0b
treee8d69bbbd04f02e5b64213cd87bbe4a64cbacf5c
parent5f6fa48a44506886aaa997d26ad41f44637d3b0e
parentd5aaf57a85f672aa210396992fc17a9615b6909a
merge of 9163a4b2aa3f51ec4fd9c17fbf7e8cacf1c0f767
     and b4098f1c54899bc7168ca2c5d533fd2676462e9c