Scott Moser ab08664ff5 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
2009-12-14 16:17:41 -05:00
..
2009-04-06 23:04:48 +01:00
2009-12-14 16:17:41 -05:00