merge of '0520dc5ac68960d1ddad4df9a54a1c8375eccb5f'
authorRod Whitby <rod@whitby.id.au>
Sat, 1 Dec 2007 14:20:01 +0000 (14:20 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 1 Dec 2007 14:20:01 +0000 (14:20 +0000)
     and 'f31acbcc26f0c26226e19e7d8c547973cf9a473b'

1  2 
conf/distro/angstrom-2007.1.conf

Simple merge