merge of '42aeb6cf89b649d5a016a09ae349681bf15e9d83'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 12:11:44 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 12:11:44 +0000 (12:11 +0000)
commitaeecccd180d6bf1072d5c64d4ff95860b10e4187
tree7bd9f4dc8ca9bab082ea5dfb2c86bbba16046166
parente7005ef68aeb05f4656029050b31c44a8e09f167
parent7a9634cdd7863282cab800dc6db17e731b03164d
Merge ... '42aeb6cf89b649d5a016a09ae349681bf15e9d83'
     and 'c9fa7fb8325f8de84b0694b28c1c0dc3e23e77c9'