merge of 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 22:25:17 +0000 (22:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 22:25:17 +0000 (22:25 +0000)
commit2e545fa99d42e8705114ea6a673bd7a688ed6976
treea7d1d4c1f351d4ef93ab12b79e89f7dcdca96f57
parentcb643cd532beed74b6ebf7c03394cdb470063ab2
parentdcbbfc041e59a98c9d88f4972230c4610af7a96b
merge of 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7
     and eee7e0d8ba89227d29beba3bc804f5340553c590