merge of 'bb233fef5b7011690cc33565cb45dadb42be30c7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jul 2008 13:36:13 +0000 (13:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jul 2008 13:36:13 +0000 (13:36 +0000)
commit3e55b91527393ec9ebe2d1ecd2fd59281206d118
treef594b546c82eaf7b21de18ce44db5b7db71d902a
parent8ee73ac842b01d0852124a8ada6632a439126f27
parent5813fca142ff995ed4e5c1c0e6d1d5f007fa7591
Merge ... 'bb233fef5b7011690cc33565cb45dadb42be30c7'
     and 'f22e68740932b52d4128634598e1377947560f47'