merge of 'da2adc92c99cff2b86889236f56aa4071a73c158'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:02 +0000 (13:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:02 +0000 (13:38 +0000)
commit20ceeaa57c1cf5b05e78454d2252838d0ef48e3b
treecae6b7a0edf4a99f8f08ad1628f366f3a599430d
parent852880e921666f590a80eb1464f19d6a0ff1b666
parent104cf2af956a4281fd40acf88ba7891bef32c858
Merge ... 'da2adc92c99cff2b86889236f56aa4071a73c158'
     and 'e9758ef5cc8f5e67a47f0490c6a6040a07926c75'