merge of '4438796403c22448a9b59d2e3ef3a1862c3dbb5c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 19:41:33 +0000 (19:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 19:41:33 +0000 (19:41 +0000)
commit209f70af48a945e93c171b7498499e67e7d58c36
treee6af4a163ff0630fb3472ea4fb59d581eae53aa1
parent8afc20e8be1f622e700f9f6a5dc3717577bc90d2
parent1fe59e2fe70dc2f000b0825f56bd109301d645d4
Merge ... '4438796403c22448a9b59d2e3ef3a1862c3dbb5c'
     and '53810e0fab1828777809f84828547284fbd0d484'