merge of 55cbddab59b09643a3b63cc4ee2b0e3868e00881
authorGraeme Gregory <dp@xora.org.uk>
Wed, 3 May 2006 17:55:21 +0000 (17:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 17:55:21 +0000 (17:55 +0000)
commit995352d010c2bf8c0ce1e9f2379a59a7d3751c9b
treec290c68f169cd84118ee5a6787e29f2f4b49f7b6
parent409db44ecd14ff2028ba9c68ab9e83efa72410ad
parentafe088dc3559e2ea5ffed51ed5edd1d4b2948e5d
merge of 55cbddab59b09643a3b63cc4ee2b0e3868e00881
     and 6c472154e33dc1921c2f82761fbaad9a37abebed