merge of '909c536d732a709ac1bbe82a546de7dade5fdf07'
authorHolger Freyther <zecke@selfish.org>
Wed, 26 Dec 2007 00:42:23 +0000 (00:42 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 26 Dec 2007 00:42:23 +0000 (00:42 +0000)
commit5867852a8e90a31151acdd555a313ce660d4573c
tree0564255a65f8e6b6ab1bbd5c58c85a686da22345
parent6e03f54929969450bcc876200c6aabcb7123cbe3
parent697b9b92a5931ad9042a282ccc0297c595d46644
Merge ... '909c536d732a709ac1bbe82a546de7dade5fdf07'
     and 'dafddd1d044d96ecf2e968c17c56e4f9f332240d'
conf/distro/include/angstrom-2007-preferred-versions.inc