Merge.
authorJan Beulich <jbeulich@suse.com>
Fri, 13 Sep 2013 12:28:46 +0000 (14:28 +0200)
committerJan Beulich <jbeulich@suse.com>
Fri, 13 Sep 2013 12:28:46 +0000 (14:28 +0200)
commitc71a3e6d83fb6d03eeae8df08eafd4ea02d9e278
tree0004587285d811993caeb1cc6d99e3934ffbbcff
parenta54dc5f4fe1eae6b1beb21326ef0338cd3969cd1
parent255d252c0afafd0d2b6a9e4c2ad4dadbd2f00051
Merge.