Merge branch 'inlining'
authorJonathan Schmidt-Dominé <git@the-user.org>
Mon, 24 May 2010 12:21:12 +0000 (14:21 +0200)
committerJonathan Schmidt-Dominé <git@the-user.org>
Mon, 24 May 2010 12:21:12 +0000 (14:21 +0200)
commitaa60cf082cd58871895e5cac159d707bad9d1009
treeb720d846953b1d9714479efd8f56aa148df4c0c7
parentbc18d36c00b92962a3fd8aeffbf52d9bc7d19ad1
parentc6e14f7bd25d549856eca0b4087f8bccc2a23c15
Merge branch 'inlining'