Merge commit 'johnw/master'
commit8d749373547a4f0f09a2ca8ef42ae11823b27cc3
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 24 Oct 2009 05:59:38 +0000 (24 07:59 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 24 Oct 2009 05:59:38 +0000 (24 07:59 +0200)
treece4f25605b355f28de7f928d9fa5e10b50f76af1
parent2d7991e268ba09b44fd98ba769456cd54aaa6884
parentd3a779b748bac533b58b019634511790cc7141b1
Merge commit 'johnw/master'