merge of '777103e5b5aa7d64334c2a82ce75fa5e033379db'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 00:25:41 +0000 (00:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 00:25:41 +0000 (00:25 +0000)
commitaaa6972c4734b76385664c862760dcdb4c63d6fe
tree7944a06f424b05ddf8d6aa2602f94e83092eb091
parentedf7f49a96cdc5c4160be3085d34309884f86133
parenta749e1f719d9e5d992865b3f421e5da139053c56
Merge ... '777103e5b5aa7d64334c2a82ce75fa5e033379db'
     and 'f70cc54fbf41943e412d1aaa62dc0abbc1d3358a'