merge of '674974b81d2da7e7d81070dc38e8b163632c887e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 26 Jun 2007 09:40:27 +0000 (09:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 26 Jun 2007 09:40:27 +0000 (09:40 +0000)
commit7147e81f2ab5b63ef008189773b926138f99d860
tree5af92d34523c8b26c6a29115b290b3e6b8caa1d6
parentf7dbba7166d6d078767039358cf8643c4b545c80
parent8bb87e16226fb6cfabacdc2ae7257003900a980a
Merge ... '674974b81d2da7e7d81070dc38e8b163632c887e'
     and '89afd3974ed8a86d2683d1222dcb1c60b2295772'