merge of '55c714e37be4606a4166b3df883d5f404d3889bf'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 00:33:28 +0000 (00:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 00:33:28 +0000 (00:33 +0000)
commit6e90aae26efa66553063b74b9afa9563b70fb982
treedc0273068963d8e57f48f75875e5236153cf1cd9
parent496d5415774f03b6e09aee17763ac9432d9c2755
parent62007cb1fac3e5a7f4a09b61c7d3c3b7cd5fc8a7
Merge ... '55c714e37be4606a4166b3df883d5f404d3889bf'
     and 'd714000fc8a6b75093a93f01782724b65d31eac1'
conf/distro/angstrom-2007.1.conf