merge of 1de0fd1842b598a87e5a45127325beb9643793a4
authorJustin Patrin <papercrane@gmail.com>
Sat, 4 Feb 2006 01:42:52 +0000 (01:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 01:42:52 +0000 (01:42 +0000)
commit0c8f25a194d556d79f64e7df0a47a6254507e36b
tree4e5eee3320e098b5b37c216b750b5b9686bc0026
parent8e3bb5e94ede91ac9d7d10d416ae9fc506bd0dd7
parent68bbf3db1f5e24adc9e759bf0dd0274cbcd67910
merge of 1de0fd1842b598a87e5a45127325beb9643793a4
     and aff5a7a57c5f19ed3d9fe9c0e2cee65bbadb6041