merge of '360252a7aec7a1e6c96f9b1714b0995b55b94134'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Jan 2008 07:48:53 +0000 (07:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Jan 2008 07:48:53 +0000 (07:48 +0000)
commit8f3b63a69c689bc4a534e0445839e59f1985a34e
tree55d23a8d57340aecc8cede9b5a6f7c13ef315d24
parentdfbc34973c10aacdacb78950099ba4e105b002ef
parent7c840dfb383a8dbb710c9566d785bf52002f61a9
Merge ... '360252a7aec7a1e6c96f9b1714b0995b55b94134'
     and 'c6c33aa5d673dccd6d19de32e40edd19565dbb5a'