merge of '4dc9e841adc6770da91963ff705d5101d2ff3417'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:50:43 +0000 (19:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:50:43 +0000 (19:50 +0000)
commit3ce5e32fe3a58bdb7de276731ae3fcf97b655e16
tree259af2813be7ac5a5dd98263d49f1248c7852a99
parent4341c89b83cd34ccac7f3f29ee84690432504602
parent3ffe2ac11fba212832243ec6f5a7cf9f02b2e171
Merge ... '4dc9e841adc6770da91963ff705d5101d2ff3417'
     and 'fd1d401ab19d2e2f42e5f93edbf8609e4e3012de'