merge of '1d77e0a89198e422acfb66d9310fad7b0b290e38'

and '5271eb82ac21ebc1a96dd31c462a14e2aaa0c89e'
This commit is contained in:
BlubMail
2009-09-13 16:33:32 +00:00