merge of '135f1243bae7b8d2761f12a5ee4792c0fdd61cd7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 23:33:58 +0000 (23:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 23:33:58 +0000 (23:33 +0000)
commitef4e691479b47bf34d0816ddf063c2e282182880
treea88bf3cf10e5b3031a821ba2cb61ff2e88e22a5f
parent25d8d3285f2bce8a6d63f9f3a1e7aca2a4a55a25
parent355bcc65fe217907a468c2754f85639109a59ff7
Merge ... '135f1243bae7b8d2761f12a5ee4792c0fdd61cd7'
     and '4eb5b005a1da43a766a4d6f77af48d3ba0a994a4'