merge of '9bacfdd26bdeaacd4a971d85fd05e2db9d7a3018'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 12:05:12 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 12:05:12 +0000 (12:05 +0000)
commit7702c1e86d1be2e7480b7db56c4fce2a873ca750
tree19f8613c80670d124bdf8113a0f20a14566f2562
parent972f72f4e47196817b8a3fc62a9e9dd188490f81
parent5a3684452649316724b41f4c8ecc4c35175739ee
Merge ... '9bacfdd26bdeaacd4a971d85fd05e2db9d7a3018'
     and 'f09c276e8987c4e22f71952b3b817240241941a3'