merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
authorGraeme Gregory <dp@xora.org.uk>
Wed, 7 Sep 2005 16:28:18 +0000 (16:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 16:28:18 +0000 (16:28 +0000)
commit1ac9ba56177e2d9a7e355def8b414022c0578436
tree275bfc4a60dbcbb40dcf43285fa15ec0a55a167c
parenta4d1e2b034e26206bf1929a7b2cda1a1a5c4187e
parentda0913c44655b544f54cd79dd1390000c3a2f234
merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
     and e60f9bf4e3714006cd19bf86bc76e3009a7bfff3