merge of '0ab238b94b1334bafe81ee7d6a1453fef174daef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 16:40:59 +0000 (16:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 16:40:59 +0000 (16:40 +0000)
commit8f416f98114812e5b72612e5579be0159c8d3d45
tree4073177116bf4c644ed077f5eb81bcd71808ac7b
parentf4e2ff6d616a1788f35719797bffc44ce89176f8
parent8217f2c1337c6e270030ee3a182c6aa2a06f905f
Merge ... '0ab238b94b1334bafe81ee7d6a1453fef174daef'
     and '706fd42c80157eab994b346e94eaa415faff2486'