merge of 3da3c8510f28cecce26d43c429a795ef96d73c91
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 19:16:15 +0000 (19:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 19:16:15 +0000 (19:16 +0000)
commit67a233ecaa6ac6f117f7792429b489f806b320b3
tree5a258c6e4908419a737fc66444a248e2fc19ef93
parent4f7d64faae37bb9da46b244cd1872e4d52351107
parentdb9099806c46c4fc4be11d0a038a8015dc6ccffa
merge of 3da3c8510f28cecce26d43c429a795ef96d73c91
     and 7b0b984392478c157095acc3ffa870911991d32a