merge of '1f4f07522c89b1ab3b65e60204a55a1a00974bc4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 24 Jul 2008 19:44:54 +0000 (19:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 24 Jul 2008 19:44:54 +0000 (19:44 +0000)
commitc183920a93422f7df429c7d334b1fe8ecec4e5c5
treeadab3041805e81e3724ec71f8cdb4b36daa24e78
parente9dd1c7d51cd7bbafd5f4d32e73d46c780b32fb1
parentf5325f6a7630f24035776f1567594b230fb3e955
Merge ... '1f4f07522c89b1ab3b65e60204a55a1a00974bc4'
     and 'a8931960546bdf36307b49ffd1b252b3f0a2b108'