merge of '7299736bd45f29d862cdc7e7e31153ea62402566'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 17:45:17 +0000 (17:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 17:45:17 +0000 (17:45 +0000)
commitb380997b0218a154943d72856b343eb261d92935
tree9096707ed5e43a6b6bed3c143baa44e557a2be2a
parent288ecdbca2d898bc6aad1d617cee9d64a365567d
parent2076ae6e3491d28396ec6c12a3dd23da41e89639
Merge ... '7299736bd45f29d862cdc7e7e31153ea62402566'
     and 'dec04e494e7ab4322bcd6dc858d4d3689baf8a25'