cketti fc8d2e9979 Merge branch 'master' into issue549 ... Conflicts: res/menu/accounts_context.xml res/menu/accounts_option.xml res/values/strings.xml src/com/fsck/k9/Account.java src/com/fsck/k9/activity/Accounts.java src/com/fsck/k9/activity/AsyncUIProcessor.java src/com/fsck/k9/activity/FolderList.java src/com/fsck/k9/activity/ImportListener.java src/com/fsck/k9/activity/K9Activity.java src/com/fsck/k9/activity/K9ListActivity.java src/com/fsck/k9/activity/MessageView.java src/com/fsck/k9/mail/store/ImapStore.java src/com/fsck/k9/mail/store/Pop3Store.java src/com/fsck/k9/mail/store/WebDavStore.java src/com/fsck/k9/mail/transport/SmtpTransport.java		2011-10-14 20:33:25 +02:00
..
24hours.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
airplane.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
angry.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
annoy.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
apple.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
appli01.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
appli02.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
aquarius.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
aries.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
art.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
atm.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bag.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ban.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
banana.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bank.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bar.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
baseball.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
basketball.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bearing.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
beer.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bell.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bicycle.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
birthday.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bleah.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bomb.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
book.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bottle.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
boutique.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bread.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bud.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
building.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bullettrain.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
bus.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
by-d.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cafe.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cake.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
camera.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cancer.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
capricornus.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
car.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
carouselpony.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cat.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
catface.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cd.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
chair.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cherry.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cherryblossom.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
chick.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
clear.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
clip.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
clock.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cloud.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
clover.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
club.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
coldsweats01.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
coldsweats02.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
confident.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
copyright.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
crown.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
crying.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
cute.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
d-point.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
danger.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
dash.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
delicious.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
denim.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
despair.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
diamond.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
dog.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
dollar.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
door.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
down.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
downwardleft.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
downwardright.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
drama.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ear.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
eight.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
empty.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
end.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
enter.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
event.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
eye.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
eyeglass.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
fastfood.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
faxto.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
fish.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
five.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
flag.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
flair.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
foot.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
four.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
free.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
freedial.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
fuji.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
full.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
fullmoon.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
game.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
gasstation.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
gawk.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
gemini.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
golf.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
good.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
hairsalon.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
happy01.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
happy02.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
heart01.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
heart02.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
heart03.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
heart04.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
heart.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
horse.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
hospital.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
hotel.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
house.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
id.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
impact.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
info01.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
info02.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
japanesetea.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
karaoke.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
key.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
kissmark.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
leftright.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
leo.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
libra.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
loveletter.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
lovely.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
mail.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
mailto.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
maple.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
memo.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
mist.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
mobaq.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
mobilephone.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
moneybag.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
moon1.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
moon2.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
moon3.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
motorsports.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
movie.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
music.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
new.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
newmoon.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ng.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
night.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
nine.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
noodle.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
nosmoking.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
note.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
notes.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ok.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
on.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
one.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
paper.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
parking.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pass.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pc.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pen.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pencil.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
penguin.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
phoneto.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pig.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pisces.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pocketbell.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
postoffice.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pouch.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
pout.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
present.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
punch.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
r-mark.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
rain.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
recycle.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
restaurant.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ribbon.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
riceball.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ring.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
rock.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
rouge.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
run.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
rvcar.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sad.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sagittarius.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sandclock.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
school.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
scissors.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
scorpius.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
search.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
secret.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
seven.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
shadow.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sharp.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
shine.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ship.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
shock.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
shoe.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sign01.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sign02.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sign03.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sign04.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sign05.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
signaler.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
six.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ski.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
slate.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sleepy.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
smile.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
smoking.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
snail.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
snow.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
snowboard.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
soccer.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
soon.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
spa.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
spade.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sports.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sprinkle.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
subway.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sun.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sweat01.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
sweat02.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
t-shirt.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
taurus.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
telephone.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
tennis.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
think.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
three.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
thunder.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
ticket.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
tm.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
toilet.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
train.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
tulip.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
tv.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
two.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
typhoon.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
up.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
updown.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
upwardleft.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
upwardright.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
virgo.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
watch.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
wave.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
weep.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
wheelchair.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
wine.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
wink.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
wobbly.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
wrench.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
xmas.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
yacht.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
yen.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00
zero.gif	Merge branch 'master' into issue549	2011-10-14 20:33:25 +02:00