Merge commit 'origin/master'
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 19 Oct 2008 15:49:50 +0000 (17:49 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 19 Oct 2008 15:49:50 +0000 (17:49 +0200)
commitf512aed7b27da19b8af8643e6e93a35b4f9a1c12
tree5dd56151d80b76e7650be59c9a9355396e9af14e
parentd2f2f1120ce6bd41f1e2d6d13434997d50c0f2c4
parent78ba3ee1d71032a1325036d5cefa8d0549d76ccd
Merge commit 'origin/master'