merge of '5917d0f1af10ed2d5da45d6f72d648b629e1cb40'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 22:48:10 +0000 (22:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 22:48:10 +0000 (22:48 +0000)
commit24d6c02c8e1eb7408f1fd09eb87c9eb63355da92
tree7736651422af3e340d967dcf29139a9b381b1886
parent32652cd6ccd916670df6975cf89aebe93c4f9c31
parentfc672056c4760b31597316f58fa2a804f966118b
Merge ... '5917d0f1af10ed2d5da45d6f72d648b629e1cb40'
     and '5bd5703a4e0b185912bdd76a025e64b961d8044b'