merge of 1b2e21b185da17a194d778853f848c2e86a2d31a
authorGraeme Gregory <dp@xora.org.uk>
Mon, 12 Jun 2006 12:32:44 +0000 (12:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 12:32:44 +0000 (12:32 +0000)
commitf1ab5d1610175c155e1de6ce40500ced5cdcd83b
tree878d21b2fd1ac7629bbaba49a5cf156dffb88419
parentdffddd7000a55a3420bbc1025c6acd63a8817d6f
parentfde62dc6e3a4eed3b138f07db46c0aeeba6608bf
merge of 1b2e21b185da17a194d778853f848c2e86a2d31a
     and 649d3cf23ceed3a98c61de4cfc356bb3848b9cf3