merge of 47dce11edfa131d098408e653487b0f793394e95
authorRod Whitby <rod@whitby.id.au>
Sun, 8 Jan 2006 00:15:40 +0000 (00:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:15:40 +0000 (00:15 +0000)
commitf2f9caadc01843d18f567cb85d072d1002b7fcb5
tree5789a0a502e44441c84770ba2d98e50d7659ffef
parent57d37948ea19fcd860cd2f5577e828e126e00a77
parent7ac9d52d1b2fb6008774f1267f707c7c6a7c4b06
merge of 47dce11edfa131d098408e653487b0f793394e95
     and 76db664e471ff075c7d6410d2cae0e1bdc9b1178