merge of '439e88dbf769d76561150772ce1e5a9f63623d35'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Oct 2007 19:08:00 +0000 (19:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Oct 2007 19:08:00 +0000 (19:08 +0000)
commit63c28bf1c3d62f021f90b3bd722551a3a6c97350
treeae6bfaf22abee588fcf916531d3c42f9be496198
parente30afac76793f8ac3b4a5d3bf077408bfa82c34a
parent3f84f7432b678ab6d503bf5c67ad9792b4c61c47
Merge ... '439e88dbf769d76561150772ce1e5a9f63623d35'
     and 'ac39391bb7e64aa48f58a13b7174c19918cec7d8'