merge of '42072c537ac07457dac8a7dbd13cc1e1e288b4ca'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 12 Jan 2007 17:23:58 +0000 (17:23 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 12 Jan 2007 17:23:58 +0000 (17:23 +0000)
     and '454327ea0c22b470c4cee1218d4034e9be05e058'

1  2 
conf/distro/angstrom-2007.1.conf

Simple merge