Merge branch 'devel'
commita4f89bb97075872739d0e16c1e22ad2a53865f6e
authorJoost Kremers <joostkremers@yahoo.com>
Fri, 14 Nov 2008 22:12:53 +0000 (14 23:12 +0100)
committerJoost Kremers <joostkremers@yahoo.com>
Fri, 14 Nov 2008 22:12:53 +0000 (14 23:12 +0100)
tree1b7b2aea0d3df9ad3a295a147edd27449a9b5a40
parente5291a39d60fe6420cd9521d62630b04ee145746
parent88f66457b90bc3d0ab604f9a475688ea64f460c4
Merge branch 'devel'