merge of 10c72a538eb4e61277bcb8b38549768080f9039a
authorRod Whitby <rod@whitby.id.au>
Wed, 7 Dec 2005 00:02:20 +0000 (00:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Dec 2005 00:02:20 +0000 (00:02 +0000)
commitd22a25d432f1ff77cf4576dda8806ecb05c4bd71
tree30dda8848bd9819dcbbd6b420f7376c343c9a36b
parent2031ed0948c018ac1d1c0e33eb1e76d2fccb8b38
parent34420f9eaa852508924731394b70f5ae788ec0f3
merge of 10c72a538eb4e61277bcb8b38549768080f9039a
     and 79a998fb2cba55ee5a3451a77bcdc934c1ed2d8a