merge of 7cf02eba7575b6840c1fb5d91671c51d7ce49303
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 10:58:28 +0000 (10:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 10:58:28 +0000 (10:58 +0000)
commitba4813236cfa8e229ddae4af68bb12b7ef9c9822
tree5b08f5a14b0c44f5c24f721df6361c4f83cb3ab9
parentdb96eaf0375c0458ff4d56f24a73d5ce8067940e
parentc178dd162c983723a604a49c87f433ac591a5f99
merge of 7cf02eba7575b6840c1fb5d91671c51d7ce49303
     and e6da98bac7d686d3e88211061aa2804f4f75c109