merge of '4b865f129d7c784106bb82861c16cc6330c629a9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 3 Jan 2007 23:22:42 +0000 (23:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 3 Jan 2007 23:22:42 +0000 (23:22 +0000)
     and '7e82eca3f8662bfb12dc49e93daed21b2aa8feeb'

1  2 
conf/distro/angstrom-2007.1.conf

Simple merge