merge of 1836da10f903d9ee68a7255b7a5d899128f4f43c
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Dec 2005 12:01:35 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Dec 2005 12:01:35 +0000 (12:01 +0000)
commitaa467290637b8d7ac2401d2b89f13ac5c04eef2f
tree8b1299175b65878b02de19c0532e5c39e8fdc433
parent7acfd26c06a4d910fda1f246fa21cb0610c7cf4c
parent8a4cbfe4e291a9785b09d788b999be2abf3af4cf
merge of 1836da10f903d9ee68a7255b7a5d899128f4f43c
     and d52c3796ab80d51e4749743886263398c84dffac