Merge branch 'master' into tmp/lslezak/after_1.1 tmp/lslezak/after_1.1
authorLadislav Slezak <lslezak@novell.com>
Thu, 2 Dec 2010 15:26:43 +0000 (16:26 +0100)
committerLadislav Slezak <lslezak@novell.com>
Thu, 2 Dec 2010 15:26:43 +0000 (16:26 +0100)
commita68e97017646f60883c5538c5e4e8204f3101904
tree16fec9d8b035d4c4ac7f7c8a97e1006507da4c08
parentc8f5d2d5752020ddf9bad45556ffc1b64c93a81c
parentb120be9d284cb36e2fec95c8a1172c6f6e90156a
Merge branch 'master' into tmp/lslezak/after_1.1