Amanda v0.2.2 #15

Merged
merged 14 commits into from Nov 29, 2011