merge of 2e1b97f979cbf150f471cf8ae18f6827f8c81a56
authorRod Whitby <rod@whitby.id.au>
Tue, 24 Jan 2006 12:30:18 +0000 (12:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 12:30:18 +0000 (12:30 +0000)
commitbdb9240b069dca05883d095476d6e830634b3027
tree8183ce638fcd211eea9d8ffe9cde33e9d915d4eb
parent8ab18daa5c9b87fd1bfb2380ad2c0f0e438e1008
parent378aacc1ff39a0fc6010bfe06b126108ec904283
merge of 2e1b97f979cbf150f471cf8ae18f6827f8c81a56
     and effe6a45a7382be0e9b737ba3d9d9a631e949577