Merge branch 'master' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 25 Aug 2010 10:30:56 +0000 (12:30 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 25 Aug 2010 10:30:56 +0000 (12:30 +0200)

Trivial merge