merge of '87d56af8b268b54c15065d21ee44d5a9ccbdbada'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 15:28:57 +0000 (15:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 15:28:57 +0000 (15:28 +0000)
commitb1d994b64292dad1f055313ac772df977308dbf3
tree6211253dfbb2723966748b5f1afdcf7b1f56f796
parent598c96de7e549712a760a3d4c862692989879c5f
parent595766d291827e33593df3e58ec304c76c994048
Merge ... '87d56af8b268b54c15065d21ee44d5a9ccbdbada'
     and 'a274867aa1114b795903e870451c68c2892dbea1'