roadef2010 - Revision 846: /branches/release_1_merged