merge of 65ff3c29b2d11109da1f8a71bdfcc1dfe9819b3d
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 19:46:44 +0000 (19:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 19:46:44 +0000 (19:46 +0000)
commitf58b9f0b800a7862e2e58692fa8e249fa1dcbc81
tree0091dc08b6f0cb5cdc120d4b2f1e846fe87a6846
parenta11765c6d7508a96a2974b6be41c47f2124b0267
parentbe87bc57c9ac17fc6ce6ef5cc5a70a63491a6baf
merge of 65ff3c29b2d11109da1f8a71bdfcc1dfe9819b3d
     and 9e50203982dff971247712f595aa258181bfff0f