merge of '3506b9987e9cac2db68bfd55cff9ee2f989aa053'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Apr 2008 07:28:52 +0000 (07:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Apr 2008 07:28:52 +0000 (07:28 +0000)
commit056b0247af30aa5e51c787f72be6a272026c1f6d
tree8370805c4a7dfdf5a3a68d8312c76cbf96c9f9aa
parentb2b4e4f644d7e5284bdaed0d408d70121da008ca
parent3f3373a968e2d5646efe0fce8348d767d8d6b392
Merge ... '3506b9987e9cac2db68bfd55cff9ee2f989aa053'
     and '387792ddbaa8e8b90a0c30519d749b13371a81b6'