merge of '063eb0ee158d77c4c6ba8c5ca8b517b3380b0d66'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Oct 2008 17:05:21 +0000 (17:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Oct 2008 17:05:21 +0000 (17:05 +0000)
commit49d5a95e391ad4dba4a60d909f47b78f140f4562
tree34d0be1b90b5b45ecd7569ee33cc2c1a3dc66a59
parentca7716767e99afc18acce578c662b346148c39a7
parent07a1cdc3d5e872f6787d681ab4b8bc3e2e13dd18
Merge ... '063eb0ee158d77c4c6ba8c5ca8b517b3380b0d66'
     and 'eda920dfeccbfa68c48217a7ccb00fad8a8a62c2'