merge of '4a9764846eca8e7a6608990c71feaab1b82bda1f'
authorHolger Freyther <zecke@selfish.org>
Sun, 23 Dec 2007 21:59:00 +0000 (21:59 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 23 Dec 2007 21:59:00 +0000 (21:59 +0000)
commitca4bb462deb3b86c87b0f81ad097620ccfd199f7
tree6ca22b6dc731c283a53ea68a165527cd80c9d2c5
parent5a327da93307827512a2e1f33f3d4cd0a91f8f5f
parent2068d289bb9a9d0c2823a110d7751ba9e72e6542
Merge ... '4a9764846eca8e7a6608990c71feaab1b82bda1f'
     and '541cfc2fc33004938c0e49fd51af40168cd2b1bb'
conf/distro/include/angstrom-2007-preferred-versions.inc