sync karmic and trunk

This commit merges 
lp:~soren/ec2-init/0.5 at rev 67
and lp:ubuntu/lucid at 0.4.999-0ubuntu8
This commit is contained in:
Scott Moser
2009-12-14 16:17:41 -05:00
parent 31247ef660
commit ab08664ff5
5 changed files with 91 additions and 28 deletions

View File

@@ -2,5 +2,5 @@ deb $mirror $codename main universe
deb-src $mirror $codename main universe
deb $mirror $codename-updates main universe
deb-src $mirror $codename-updates main universe
deb http://security.ubuntu.com/ubuntu $codename-security main restricted
deb-src http://security.ubuntu.com/ubuntu $codename-security main restricted
deb http://security.ubuntu.com/ubuntu $codename-security main universe
deb-src http://security.ubuntu.com/ubuntu $codename-security main universe