Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Sun, 7 Dec 2008 21:57:46 +0000 (08:57 +1100)
committerMartin Schwenke <martin@meltin.net>
Sun, 7 Dec 2008 21:57:46 +0000 (08:57 +1100)
commitec354d602d20700e6769deb798436d08256a49d5
treec4e9f6792ef729c242ec9c51f6a9bade383a0575
parent3d59783c0e9478f4766c380945d6200fc654f5d9
parent32d460b8469eb53145f04161a5d01166f9b5f09e
Merge commit 'origin/master' into martins
Makefile.in