merge of '8f49a303307612ac522fcb5f02663262b08cbd0d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Feb 2007 17:43:42 +0000 (17:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Feb 2007 17:43:42 +0000 (17:43 +0000)
commitd42c2b6ab0bc7a3280747f58c0b042adeef6a301
treed45510062ac2c5d0d33dc2a015d59b6323508f47
parentc1f72fe801a6baf92e4910664aea8b6a2583d41a
parent4346c02aeee770caaa040e2499df0aa1ebd2d6a0
Merge ... '8f49a303307612ac522fcb5f02663262b08cbd0d'
     and '9734d0f4adaf001ab22698b8cab8498c54f04e32'