Merge branch 'upstream'
authorIustin Pop <iusty@k1024.org>
Tue, 26 Feb 2008 19:59:56 +0000 (20:59 +0100)
committerIustin Pop <iusty@k1024.org>
Tue, 26 Feb 2008 19:59:56 +0000 (20:59 +0100)
commitde4083cf863a2909c7dbc6c975a06579b0998a32
treef27ab404eb326ea3cd297646cb94ba4dbfffbf7c
parent60b9fee2440de6f51a885a053e4096edf89d4d08
parent342002b3362a7b7da691795a1caea43e93076eec
Merge branch 'upstream'