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)
commited8828d4b44c620d6cfb9b6a09a47f2acac9569b
tree848d5f3d587eabffbe8f0092cea5864da3a81866
parentb68e57bb33163d460d710fe71187b6fed037c573
parentbf35832f54f88a44211080455a9b1acdc2f797ba
Merge ... '42072c537ac07457dac8a7dbd13cc1e1e288b4ca'
     and '454327ea0c22b470c4cee1218d4034e9be05e058'
conf/distro/angstrom-2007.1.conf