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)
commitfdf5a003fdaeba376c9ec1aa0a0b305f8dc4fcb8
tree265312f415dbd9a48eec1930792ffabb74dedbac
parent214ed085dec831f0f1a9a369ca3646e187b85949
parenta5fb224426c234fa7d6e1e8821b4efeb53c1add3
Merge ... '0520dc5ac68960d1ddad4df9a54a1c8375eccb5f'
     and 'f31acbcc26f0c26226e19e7d8c547973cf9a473b'
conf/distro/angstrom-2007.1.conf