merge of '706cfac4c4f36e78c23b5d62cd653b2820091c04'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jul 2007 15:46:18 +0000 (15:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jul 2007 15:46:18 +0000 (15:46 +0000)
commit1eb9a4277527f4aeb58126ad9d53374ad904c773
tree430797b2808ec02cb5645d781895faa49dcbf527
parent6f756192d4e7819aaeb90ad1e3e62e0bb2343e95
parent67a8c723f50b06978d70ffe4d373e025ff40645a
Merge ... '706cfac4c4f36e78c23b5d62cd653b2820091c04'
     and 'c293cc4e6d77cae86deaaf6f134d6640daa2f04c'