svn-merge-fairy - Revision 1: /trunk

• ..