merge of 4456e15f23db9a9f052dfcc702caeb50db1ee867
authorDavid Karlstrom <daka@thg.se>
Sun, 21 Aug 2005 21:56:36 +0000 (21:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 21:56:36 +0000 (21:56 +0000)
commit545530dcaaeef0c96685387bef6ed823b2b515fe
tree38d33c7673cae392a2db83e5716151d8f8ad9b30
parentd6bae3f42fc7ba5c928373498ef901713f2067d4
parent0fa1b9eda8502cf780be8f2e66bd42844c9e57a8
merge of 4456e15f23db9a9f052dfcc702caeb50db1ee867
     and 6a067ebc597af5f7a5d22be5966896abfeea9182