merge of '728b58626c50e060bf71960029afce111427d6a0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 17:42:15 +0000 (17:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 17:42:15 +0000 (17:42 +0000)
commit26bcd9b06a3e11c2d72553732f970662170d434f
tree96b08412e77e48940961ece7b242c5308ffd971f
parentce318a6faf04c09b37c9366978d9b634c96747d5
parentab5d9baf3148b7e7a0301c97875d356d6ec42d23
Merge ... '728b58626c50e060bf71960029afce111427d6a0'
     and 'c22898d69793df7ecf7b5bb1e62791c4780023ab'