merge of '5d6e88196c5eb74c163fb8c3309cbd1029d246a3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 23:53:47 +0000 (23:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 23:53:47 +0000 (23:53 +0000)
commit57b74239a3cbdf5323d8110e7d7c274b40cc0f95
tree87349843993ee744385bbfc41a4c52dcc7321147
parent78e5262722fdb7dc3005e65fff1f79bc3ff7a844
parentf8979030138baa5a83d45de1ecb3d7650422be8c
Merge ... '5d6e88196c5eb74c163fb8c3309cbd1029d246a3'
     and 'd31a66aa95e2e73c0df082e42443636e23249325'