merge of 3392085b60cfb0f161a99c870ef6f89a6e93fdba
authorRod Whitby <rod@whitby.id.au>
Mon, 10 Apr 2006 22:30:15 +0000 (22:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Apr 2006 22:30:15 +0000 (22:30 +0000)
commit0a6048ee45a7cca833c37b07c458f7fa0f28dd79
tree576374a287c936e403ca01c19b6ea7aeb805ef15
parentae37f74013fca27d3f784b4b2555db57433e0c6f
parent00fcf5a48511ea4798896bde2a9172eea1888fc5
merge of 3392085b60cfb0f161a99c870ef6f89a6e93fdba
     and 4c9177abc1e90522db01ceaed6de73ac1d5c0800