Merge branch 'master' of http://www.project-moonshot.org/git/moonshot
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Wed, 30 Nov 2011 18:33:33 +0000 (18:33 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Wed, 30 Nov 2011 18:33:33 +0000 (18:33 +0000)
commit15667b85ab88615f0ee1693a39333f755f0974f7
tree8ba075d122f090dab4ac642e8f592f81cf47601a
parent4f1d845f74f627f8e8f815f7786481f56132f12d
parent67d88e629802d927e567ba3c339412ffbbd84e2e
Merge branch 'master' of project-moonshot.org/git/moonshot

Conflicts:
moonshot/mech_eap/Makefile.am
moonshot/acinclude.m4
moonshot/mech_eap/Makefile.am