merge of ee7a6ae9f04d3b86e0a6b611e45b6380c8c337b2
authorRod Whitby <rod@whitby.id.au>
Fri, 2 Dec 2005 17:16:23 +0000 (17:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 17:16:23 +0000 (17:16 +0000)
commit9d53b117dae49d71ddd1388a673a5ca6df2c130c
tree635d57e2e7ea53c477f0d268f04b7f6a50613676
parentf1d97cf9af58b547348c14cf65c1e71ddb630b6b
parentd416cca1e8d5b1f1a3f1e82dd2d495f34582bd41
merge of ee7a6ae9f04d3b86e0a6b611e45b6380c8c337b2
     and f9c84000e93bf9f50a0ddf33a8097f22d724d95f