merge of '9fdf613358c5efcdb75a30ee08729a9e2a7ade08'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Mar 2008 16:04:12 +0000 (16:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Mar 2008 16:04:12 +0000 (16:04 +0000)
commitf54bd12991023b60209135e7e77b86afa2b80b76
treeb97769d104766c213609b5f7bc6c7fb514a2909a
parenta61d0ff5bdb2c9006f5e35d70cea3f74f66231d1
parentaae834760ee0eb60cfa60353ad09c6b6431acee4
Merge ... '9fdf613358c5efcdb75a30ee08729a9e2a7ade08'
     and 'ee2aa51c8eb93fa5579f4cf49a53eb0cb3e90319'