svn-merge-fairy - Revision 8: /trunk/script

• ..
• BeautifulSoup.py
• fairy.py
• fairy.xml.example
• fairy_config.py.example