merge of '4a44b08ef83a5075a82f85c34d592996acfcec95'
authorKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 09:04:44 +0000 (09:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 09:04:44 +0000 (09:04 +0000)
commit23f0dd84f22cf48a4a678022c546b2cd829df54d
treeadc56155a564b36612f585421767e6c3ccaf98e3
parent4df6160f24b0049d2956740847eed1ed484d5d0a
parent3e3d310a7640121017ae8eca7e86dbd64530c3da
Merge ... '4a44b08ef83a5075a82f85c34d592996acfcec95'
     and '525970acffe8506ad362922236614a52c8860952'