merge of '3ceed45c9d4c44db45af90121464ecd4dfb6317c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Nov 2007 12:52:47 +0000 (12:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Nov 2007 12:52:47 +0000 (12:52 +0000)
commit804e6e798d8957cc980abc3da1219fc4adebe18b
tree5f3b250af7dc7ce09948c368773dd3682fb29675
parenta2343918324d6de98100c0e5826663556778a916
parent78b835e553ed839f4a611d61aed61240f459460e
Merge ... '3ceed45c9d4c44db45af90121464ecd4dfb6317c'
     and '58f9cc3cc29b0ffac55233ed8b792c82479f05bc'