merge of '57f94c184ca1457e6b7683e84bcdf4863b46cd03'
authorHolger Freyther <zecke@selfish.org>
Tue, 23 Oct 2007 15:03:38 +0000 (15:03 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 23 Oct 2007 15:03:38 +0000 (15:03 +0000)
commit63dd0ca2b28510d8ad9d71fd4ba6e55ebc8f01d4
tree4f145a9c0f51808985a238506e3e42d7d440f103
parent1f9d1e13d95e330d7bd47183eeb4ce7d098431aa
parent92d1fb2c780cc5787e7bca3c81086948e853ca5f
Merge ... '57f94c184ca1457e6b7683e84bcdf4863b46cd03'
     and '730545b38a3f93aa84767feb0e823edcd31ab0b5'
conf/distro/include/angstrom-2007-preferred-versions.inc