Merge branch 'timestamp-648188'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 20 Apr 2011 07:49:52 +0000 (09:49 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 20 Apr 2011 07:49:52 +0000 (09:49 +0200)
commitbdea54f59e52ebeaa0743674aa5998636f26a241
treea1d5920da73c6737225bfa31b594cb4dd00f59c0
parent9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734
parenteb6ab4328849a0c5ee5959560f90f36fd71a815d
Merge branch 'timestamp-648188'