merge of '3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 22:02:21 +0000 (22:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 22:02:21 +0000 (22:02 +0000)
commitec540b055c4571f47887e5a086a0158e4c2abba7
tree4845da92d3f09534d2f314e688f1361e7500ce29
parent273e148df6f207ad2393d756dfe1202253ed4e8e
parentc304dc8a5c11499f4935ea743825b44890440d08
Merge ... '3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451'
     and 'fa0e8dd852860da362d27938db78954d4c8791ae'