merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 13 Jan 2006 22:50:24 +0000 (22:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 22:50:24 +0000 (22:50 +0000)
commit7896470157b166dcceee2fc8a513e125fb73ec45
treebff8aca8dcd82ef9d18bdc54783a2713398caddf
parent940e3a86f1bcc4b8cb373a39c5646ac1de1b6160
parent308ca12370f485243e31dea49bf3d98dde33c901
merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
     and e118e6eeb9d00fb7d7577c8cfdea6ed409fdc2a9