merge of '2b710e1818e35c1ae6f03e19452a17638f3b8048'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Jun 2007 08:49:48 +0000 (08:49 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Jun 2007 08:49:48 +0000 (08:49 +0000)
     and '9a039e377450d290fde23e8f83821bd022343fd4'

1  2 
conf/distro/angstrom-2007.1.conf

Simple merge