merge of 7e5aec0634897d3c7afdf3aebe3c28008e54239b
authorDavid Karlstrom <daka@thg.se>
Sun, 21 Aug 2005 08:14:51 +0000 (08:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 08:14:51 +0000 (08:14 +0000)
commit19235c78897e5219f04180412e5ab6fe2f22e30d
tree35d573f344dd1759ed374992f0b20a7b59563ae2
parent87d3b1ad2dad434d9ab2124fb9c0ee997ecec246
parenta0097aa2e676041ec78482bbfe721d31dddca6aa
merge of 7e5aec0634897d3c7afdf3aebe3c28008e54239b
     and 8ba34c2a2418ae3ae68c35cd0c6a9b535ec1178b