merge of 24f6b65766e0de225c683f9ad48a63ee1a2cf779
authorRod Whitby <rod@whitby.id.au>
Sat, 5 Nov 2005 16:09:03 +0000 (16:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 5 Nov 2005 16:09:03 +0000 (16:09 +0000)
commitb57976ec426fe3606acce1ffbf4352dc05d20af3
tree2a0405f211a680130ad1241ab7b8de261209bb5c
parentda805c92d09b4bf82a6945d603f194a314b7337d
parent7c0e561a46c5c529d0e9e8c199693afb386b76db
merge of 24f6b65766e0de225c683f9ad48a63ee1a2cf779
     and 680976b94fa3d2c3b2a4dcb5043cfd5e27b05993