merge of '22d706dfbdc70fb305106958f1ac66017d3b64d3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 15:28:18 +0000 (15:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 15:28:18 +0000 (15:28 +0000)
commitcdd1cf3fc9732b6bc5437f53293f445472cf875c
tree99b9dd4b9158e22a1f93e5505c913b694d4bc122
parent5d4ce8a8a30c9c595f5868da6ed14eebd0fd2683
parentfb718b044ad6597147540b69551c8d3851db62da
Merge ... '22d706dfbdc70fb305106958f1ac66017d3b64d3'
     and '312abdcbb7f1c8b20dcda1dadb8df745c4db060d'