merge of 02948f94edc060110b60e3cb3e5b547d77f8c493
authorDavid Karlstrom <daka@thg.se>
Wed, 3 Aug 2005 20:20:15 +0000 (20:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 20:20:15 +0000 (20:20 +0000)
commitb0911d92c5c7838cbfd9dd77f1fcd16bcbfe2262
tree6727ac6c741bbbbc6b498ca5d93470e23788e05a
parentf472b8a244b9e20fcf9076aaf9bf2eaa892c63d4
parent1d3ca13d5cb4b796bb7d6ac1d86343e9ec34801d
merge of 02948f94edc060110b60e3cb3e5b547d77f8c493
     and a4218d106d35f16fd5c3c989fa4443eed9b62dde