merge of '0db5a631daed7a2002855bd39af92ef174a28037'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 10:14:37 +0000 (10:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 10:14:37 +0000 (10:14 +0000)
commitd2ef83fd962a4b02415ee1f655cae324589a9009
tree5ba143d67e07b5876b47d637e126b48b456cb758
parent2dc25ce7caf72b58900b88870e7e022e569f7a61
parent4a37d232cb35608026da46499ba8524fc41e9470
Merge ... '0db5a631daed7a2002855bd39af92ef174a28037'
     and 'fd42dbc3f52d856f1d5210791ff3fc2be2bc2749'