Merge commit 'origin/master'
authorChristoph Mair <christoph.mair@gmail.com>
Tue, 25 Aug 2009 21:26:24 +0000 (23:26 +0200)
committerChristoph Mair <christoph.mair@gmail.com>
Tue, 25 Aug 2009 21:26:24 +0000 (23:26 +0200)
commit462fa8fdfc398f9cd663871895cd3fff90251e3d
treea47696dcfcafc7d473c363f974cb817fb8124601
parent539a5dcbeae0abe0a9a56d35d1a554780be11f3d
parent56e6fe0bdea6f858793d469ba25d9cf0f767bc69
Merge commit 'origin/master'