merge of '3b41e4e73158261f5bf7a4671ebe1acc90e80a9c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 May 2008 14:50:07 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 May 2008 14:50:07 +0000 (14:50 +0000)
commit747908f07a09c9817fc1fb8883ba0407321eae6e
tree010bd51e452723998af1def0a4a4032fc7c60cfa
parent8cd84c6c4379abb97892d0e1f38d3fa7bbfa9a75
parent3db397228dc50a47422fb6f64a98993c8a96a37f
Merge ... '3b41e4e73158261f5bf7a4671ebe1acc90e80a9c'
     and '545cc6bcb45999e0577dbcf287bebfa887c83b9b'