merge of '8e43a244ea9fa6baf5febba95c6b7c0bf5ed1c99'
authorCliff Brake <cbrake@bec-systems.com>
Thu, 13 Dec 2007 14:05:47 +0000 (14:05 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 13 Dec 2007 14:05:47 +0000 (14:05 +0000)
commitf4a7dac492fabd4f30dcad003cdcabdf6684e39e
tree312e1b5003b9ef65e718b145052d447f2f8e2653
parentf57931308d556462ea030f151705c7a86ea37efe
parentcb76f7fa94314d1c9fe1001ddf6ce55d87622ae3
Merge ... '8e43a244ea9fa6baf5febba95c6b7c0bf5ed1c99'
     and 'a3c2ca2c7bfaba0da5e3b8076463aa98d2cbc7ee'
conf/distro/include/angstrom-2007-preferred-versions.inc