tree fbb5590ceb1073aad97f48d0237f9715b0207707
parent 7a619ab30a0db64c22fb053702c41a94f05cf648
parent 7b2fac7654f7420c2787f74ec3b1540fa3b343e9
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1312477199 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1312477199 +0200

Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'