merge of '71a6f5cc95d96aa5be61904d011fd4dcb8f968cb'
commit113d35d978a971aef357e76de60aa2fbbb22837a
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 10:57:51 +0000 (6 10:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 10:57:51 +0000 (6 10:57 +0000)
tree3d8a5c5c1ad5f4b9ca56d1941785c78fcfa6dafd
parent4dbaaa81d31d670a263cadb4eb3639ea81a8fb8a
parent1f37cf6c1809712d22679f7145346070f61f307e
Merge ... '71a6f5cc95d96aa5be61904d011fd4dcb8f968cb'
     and 'b2e500e4b850630068400cee09253779d13dba03'