merge of c7620f4faaa4b7b9a2f58272644e99ef17e66c9c
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Jan 2006 11:00:53 +0000 (11:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 11:00:53 +0000 (11:00 +0000)
commit9c62a6b5ca6c606d670955061ae4f570270aa3af
treea5d043f261cf7765672c35046be4d5a4bc1b5dfe
parentc8508a346bd0d33126fef88406bab42320514abd
parent1cff8772528f5bf97ac732a157b9daf63feab5c2
merge of c7620f4faaa4b7b9a2f58272644e99ef17e66c9c
     and b78c38c1ca7715097407f79c1f432372e7b8c258