merge of 7ec369fda75af141429df5f12e02b43d815f6515
authorRod Whitby <rod@whitby.id.au>
Sun, 21 May 2006 01:41:12 +0000 (01:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 01:41:12 +0000 (01:41 +0000)
commitb4aade330e5191ba9a0a28c37e04da4ddb6148a4
treebea8e4f5a46cc9ea04d193354a981041ac6abc04
parent33b1b04024f907869bd32090e70b4423c384bd65
parent67350820bf4a72f5fdd75d3918c344b27096d858
merge of 7ec369fda75af141429df5f12e02b43d815f6515
     and abf00cce624bf75483d805556b1219a4bb3638c5