merge of '1bb95c93cc0333355720a49f6933cddc3e57fc7a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 09:58:32 +0000 (09:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 09:58:32 +0000 (09:58 +0000)
commit1064221738500e8384993e2b0e14026eca803af7
tree1a2ca56cf066eb9a2c0accc8aaef98c220155664
parent23719bc83fd83bb97f4a1b1dd3f827695d650466
parent65bc4f8d870ad81f9e92f9b5930ee6bfd5964af1
Merge ... '1bb95c93cc0333355720a49f6933cddc3e57fc7a'
     and '54c79c3345238c5d9b19bb64d60aa8a01ab471a1'