merge of '0366fffbef665b0cabc497886e24038bbc2a9a33'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 16:48:41 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 16:48:41 +0000 (16:48 +0000)
commit94e5d58d26903ea83db255f360c8526a563a4385
tree478cb769b1761a9152c9edc681693616896e12f4
parentdad9838b26a266343467ccd3312f32ccaa6694c4
parent637168b89ecf31fd7508d0f4ebfde9844e807f8c
Merge ... '0366fffbef665b0cabc497886e24038bbc2a9a33'
     and '479d13695983e03ab97dd5dc4227bdf7453ca63b'