merge of '2a8702db4281b5dc1be59182ca755ae0bac6b5fa'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Aug 2008 13:56:24 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Aug 2008 13:56:24 +0000 (13:56 +0000)
commitf6b83201da447b5efd6532586e41a9017752dcf0
tree5b52636a98dfad519f180b34216de6cf447d2b83
parentda235d15278d65cdbfa1d400ddd8ecdbafc15721
parent10690d9db09ce0787f2328deb450d554e6d810b8
Merge ... '2a8702db4281b5dc1be59182ca755ae0bac6b5fa'
     and 'c7d0711a18c512a5aa6f7085793a18d0849cf9d2'