merge of '0cb718c4b71b8cd025b681dd7861a927c49006f9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 03:30:16 +0000 (03:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 03:30:16 +0000 (03:30 +0000)
commit8279fefa17db90860303fbd53a2e0fa79c3b8539
tree5842254d6a7bcd8f807732777a754cce90e6f5a1
parentf9b083e78b37f26877bdf769824ed8a20f3ef3c8
parent3a5e610960e36d571ffaf39332a776c5e332e7e7
Merge ... '0cb718c4b71b8cd025b681dd7861a927c49006f9'
     and '678aafb268a6d6220e4ccfcf905231ac20a5b722'